Merge branch 'destroy-typo' of https://github.com/jsternberg/vcsh

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 594368def1b45ab67e947ebc3ac5be7551d27b1e..499acc1b332bb9af5fb351c1252b9de0a7e6069b 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: