Update `vcsh delete`

* Be less aggressive when asking for confirmation
* Work independently from $PWD

diff --git a/vcsh b/vcsh
index 23f8453150bc8ac28451fbcf6b0662e4e37033de..25f52f844099e382e42310dda2d8694c30228b50 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -215,11 +215,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
        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!"
        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:
 
        files=$(git ls-files)
        echo "These files would be deleted:
 


@@ -233,6 +232,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'"
                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"
 
 
        verbose "delete end"