PACKAGING: Add information about Homebrew

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 594368def1b45ab67e947ebc3ac5be7551d27b1e..f222fff8abf02f08905180a4d63b0020415969ec 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -25,12 +25,12 @@ while getopts  "c:dv" flag; do
        if [ "$1" = '-d' ] || [ "$1" = '--debug' ]; then
                set -vx
                VCSH_DEBUG=1
        if [ "$1" = '-d' ] || [ "$1" = '--debug' ]; then
                set -vx
                VCSH_DEBUG=1

-               shift 1

        elif [ "$1" = '-v' ];then
                VCSH_VERBOSE=1
        elif [ "$1" = '-c' ];then
                VCSH_OPTION_CONFIG=$OPTARG
        fi
        elif [ "$1" = '-v' ];then
                VCSH_VERBOSE=1
        elif [ "$1" = '-c' ];then
                VCSH_OPTION_CONFIG=$OPTARG
        fi

+       shift 1

 done
 
 source_all() {
 done
 
 source_all() {


@@ -72,13 +72,13 @@ help() {
    options:
    -c <file>            Source file
    -d                   Enable debug mode
    options:
    -c <file>            Source file
    -d                   Enable debug mode

-   -d                   Enable verbose mode
+   -v                   Enable verbose mode

 
    commands:
    clone <remote> \\
          [<repo>]       Clone from an existing repository
 
    commands:
    clone <remote> \\
          [<repo>]       Clone from an existing repository

-   delete               Delete an existing repository
-   enter                Enter repository; spawn new instance of \$SHELL
+   delete <repo>        Delete an existing repository
+   enter <repo>         Enter repository; spawn new instance of \$SHELL

    help                 Display this help text
    init <repo>          Initialize a new repository
    list                 List all repositories
    help                 Display this help text
    init <repo>          Initialize a new repository
    list                 List all repositories


@@ -89,7 +89,7 @@ help() {
           <newname>     Rename repository
    run <repo> \\
        <command>        Use this repository
           <newname>     Rename repository
    run <repo> \\
        <command>        Use this repository

-   setup                Set up repository with recommended settings
+   setup <repo>         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
    which <substring>    Find substring in name of any tracked file
    write-gitignore \\
    <repo>               Write .gitignore.d/<repo> via git ls-files


@@ -138,7 +138,7 @@ clone() {
 delete() {
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
        use
 delete() {
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
        use

-       info "This operation WILL DETROY DATA!"
+       info "This operation WILL DESTROY DATA!"

        files=$(git ls-files)
        echo "These files will be deleted:
 
        files=$(git ls-files)
        echo "These files will be deleted:
 


@@ -151,7 +151,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

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

 }
 
 enter() {
 }
 
 enter() {


@@ -214,7 +214,7 @@ rename() {
 run() {
        hook pre-run
        use
 run() {
        hook pre-run
        use

-       $VCSH_EXTERNAL_COMMAND
+       "$@"

        hook post-run
 }
 
        hook post-run
 }
 


@@ -304,7 +304,7 @@ elif [ "$1" = 'delete' ]           ||
        export VCSH_REPO_NAME="$2"
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
        [ "$VCSH_COMMAND" = 'rename' ]         && export GIT_DIR_NEW="$VCSH_REPO_D/$3.git"
        export VCSH_REPO_NAME="$2"
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
        [ "$VCSH_COMMAND" = 'rename' ]         && export GIT_DIR_NEW="$VCSH_REPO_D/$3.git"

-       [ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$*"
+       [ "$VCSH_COMMAND" = 'run' ] && shift 2

        [ "$VCSH_COMMAND" = 'write-gitignore' ]
 elif [ "$1" = 'list' ] ||
      [ "$1" = 'list-tracked' ]; then
        [ "$VCSH_COMMAND" = 'write-gitignore' ]
 elif [ "$1" = 'list' ] ||
      [ "$1" = 'list-tracked' ]; then


@@ -315,7 +315,7 @@ elif [ -n "$2" ]; then
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
        [ -d $GIT_DIR ] || { help; exit 1; }
        shift 1
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
        [ -d $GIT_DIR ] || { help; exit 1; }
        shift 1

-       export VCSH_EXTERNAL_COMMAND="git $*"
+       set -- "git" "$@"

 elif [ -n "$1" ]; then
        export VCSH_COMMAND='enter'
        export VCSH_REPO_NAME="$1"
 elif [ -n "$1" ]; then
        export VCSH_COMMAND='enter'
        export VCSH_REPO_NAME="$1"


@@ -349,6 +349,6 @@ done
 verbose "$VCSH_COMMAND begin"
 export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')
 hook pre-command
 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"
 hook post-command
 verbose "$VCSH_COMMAND end, exiting"