Transform Makefile to make re-use easier

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index e8fefbb5a39d1d025f2dc76ce0b2ffbf4d73b0ee..ba0049e542120cf4931ce3652b9b412808bef2b4 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -35,6 +35,7 @@ help() {
    run <repo> \\
        <command>        Use this repository
    setup                Set up repository with recommended settings
    run <repo> \\
        <command>        Use this repository
    setup                Set up repository with recommended settings

+   which <substring>    Find substring in name of any tracked file

    write-gitignore \\
    <repo>               Write .gitignore.d/<repo> via git ls-files
 
    write-gitignore \\
    <repo>               Write .gitignore.d/<repo> via git ls-files
 


@@ -100,7 +101,7 @@ To continue, type 'Yes, do as I say'"
        for file in $files; do
                rm -f $file || info "could not delete '$file', continuing with deletion"
        done
        for file in $files; do
                rm -f $file || info "could not delete '$file', continuing with deletion"
        done

-       rmdir "$GIT_DIR" || error "could not delete '$GIT_DIR'"
+       rm -r "$GIT_DIR" || error "could not delete '$GIT_DIR'"

 }
 
 enter() {
 }
 
 enter() {


@@ -186,7 +187,7 @@ use() {
 which() {
        for VCSH_REPO_NAME in $(list); do
                for VCSH_FILE in $(get_files); do
 which() {
        for VCSH_REPO_NAME in $(list); do
                for VCSH_FILE in $(get_files); do

-                       echo $VCSH_FILE | grep $VCSH_COMMAND_PARAMETER > /dev/null && echo "$VCSH_REPO_NAME: $VCSH_FILE"
+                       echo $VCSH_FILE | grep -q "$VCSH_COMMAND_PARAMETER" && echo "$VCSH_REPO_NAME: $VCSH_FILE"

                done
        done | sort -u
 }
                done
        done | sort -u
 }


@@ -227,7 +228,7 @@ if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] && [ ! "x$VCSH_GITIGNORE" = 'xrecursive'
 fi
 
 if [ "$1" = 'clone' ]; then
 fi
 
 if [ "$1" = 'clone' ]; then

-       [ -z $2 ] && fatal "$1: please specify a remote" 1
+       [ -z "$2" ] && fatal "$1: please specify a remote" 1

        export VCSH_COMMAND="$1"
        GIT_REMOTE="$2"
        [ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)
        export VCSH_COMMAND="$1"
        GIT_REMOTE="$2"
        [ -n "$3" ] && VCSH_REPO_NAME="$3" || VCSH_REPO_NAME=$(basename "$GIT_REMOTE" .git)


@@ -297,5 +298,7 @@ done
 
 verbose "$VCSH_COMMAND begin"
 export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')
 
 verbose "$VCSH_COMMAND begin"
 export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')

+hook pre-command

 $VCSH_COMMAND
 $VCSH_COMMAND

+hook post-command

 verbose "$VCSH_COMMAND end, exiting"
 verbose "$VCSH_COMMAND end, exiting"