Merge branch 'master' of github.com:RichiH/vcsh

diff --combined vcsh
index a57848743ccc4589d5e7195912a43702222c2bf3,41d80e3168ae8785913c95c27a5028a09a8a41eb..3a8fefcaea7fc9d3f6549d775bd9f728e3c177e7
--- 1/vcsh
--- 2/vcsh
+++ b/vcsh
@@@ -100,7 -100,7 +100,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
 -      rmdir "$GIT_DIR" || error "could not delete '$GIT_DIR'"
 +      rm -r "$GIT_DIR" || error "could not delete '$GIT_DIR'"
  }
  
  enter() {
@@@ -219,19 -219,19 +219,19 @@@ if [ ! "x$VCSH_GITIGNORE" = 'xexact' ] 
  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_REPO_NAME
        export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
- elif [ "$1" = 'delete' ]          ||
-      [ "$1" = 'enter' ]           ||
-      [ "$1" = 'init' ]            ||
-      [ "$1" = 'list-tracked-by' ] ||
-      [ "$1" = 'rename' ]          ||
-      [ "$1" = 'run' ]             ||
-      [ "$1" = 'setup' ]           ||
+ elif [ "$1" = 'delete' ]           ||
+      [ "$1" = 'enter' ]            ||
+      [ "$1" = 'init' ]             ||
+      [ "$1" = 'list-tracked-by' ]  ||
+      [ "$1" = 'rename' ]           ||
+      [ "$1" = 'run' ]              ||
+      [ "$1" = 'setup' ]            ||
       [ "$1" = 'write-gitignore' ]; then
        [ -z $2 ]                      && fatal "$1: please specify repository to work on" 1
        [ "$1" = 'rename' -a -z "$3" ] && fatal "$1: please specify a target name" 1