Reformat and update docs, completion etc

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 23f8453150bc8ac28451fbcf6b0662e4e37033de..d0e7b37b4992d6a03072b99faa3698d7a631e0b8 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -33,16 +33,15 @@ verbose() {
 help() {
        echo "usage: $SELF <args>
 
+   clone <remote> \\
+         [<repo>]    Clone from an existing repository
    help              Display this help
-
+   delete            Delete an existing repository
+   init <repo>       Initialize a new repository
    list              List all repos
-
    run <repo> \\
        <command>     Use this repository
 
-   init <repo>       Initialize a new repository
-   clone <remote> \\
-         [<repo>]    Clone from an existing repository
    seed-gitignore \\
    <repo>            Seed .gitignore.d/<repo> from git ls-files" >&2
 }
@@ -215,11 +214,10 @@ elif [ "$1" = 'delete' ]; then
        verbose "delete begin"
        REPO_NAME=$2
        [ -z $REPO_NAME ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0
+       old_dir="$PWD"
+       cd "$HOME"
        use $REPO_NAME || return 1
        echo "$SELF: info: This operation WILL DETROY DATA!"
-       echo -n "Continue? Anything other than 'y' will abort. "
-       read answer
-       [ x$answer = x"y" ] || exit
        files=$(git ls-files)
        echo "These files would be deleted:
 
@@ -233,6 +231,7 @@ To continue, type \"Yes, do as I say\""
                rm -f $file || echo "$SELF: info: could not delete '$file', continuing with deletion"
        done
        rm -rf "$VCSH_BASE/$REPO_NAME.git" || echo "$SELF: info: could not delete '$VCSH_BASE/$REPO_NAME.git'"
+       cd "$old_dir"
        verbose "delete end"