Cleanup of Corey's patch

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index c26b50a6b7465ed01d5b0181983e2e407bf6687b..5acd515dc422ab8b0dc0ef2d42611dc7db2f67c2 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -3,7 +3,20 @@
 #set -x
 
 SELF=$(basename $0)
+
 [ -z $XDG_CONFIG_HOME ] && XDG_CONFIG_HOME="$HOME/.config"
+for check_directory in $XDG_CONFIG_HOME $XDG_CONFIG_HOME/vcsh $XDG_CONFIG_HOME/vcsh/repo.d
+do
+       if [ ! -d $check_directory ]; then
+               if [ -e $check_directory ]; then
+                       echo "$SELF: error: $check_directory exists but is not a directory" >&2
+                       exit 2
+               else
+                       mkdir $check_directory || (echo "$SELF: error: could not create $check_directory" >&2; exit 2)
+               fi
+       fi
+done
+
 VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 
 help() {
@@ -19,7 +32,7 @@ help() {
 
    init           Initialize a new repository
    clone <remote>
-         <repo>   Clone from an existing repository
+         [<repo>] Clone from an existing repository
 
    exit           Exit vcsh mode" >&2
 }
@@ -40,12 +53,12 @@ use() {
 
 init() {
        [[ -e $GIT_DIR ]] &&
-               echo "$(basename $0): fatal: $GIT_DIR exists" &&
+               echo "$SELF: fatal: $GIT_DIR exists" &&
                return 21
        export GIT_WORK_TREE="$HOME"
        mkdir -p $GIT_WORK_TREE
        cd $GIT_WORK_TREE ||
-               (echo "$(basename $0): fatal: could not enter $GIT_WORK_TREE" &&
+               (echo "$SELF: fatal: could not enter $GIT_WORK_TREE" &&
                 exit 20) || exit 20
        cd $GIT_WORK_TREE
        git init
@@ -80,7 +93,7 @@ elif [ "$1" = 'use' ]; then
        if [[ -o NO_IGNORE_EOF ]]; then
                export VCSH_NO_IGNORE_EOF=1
                setopt IGNORE_EOF
-               vcsh_exit() {vcsh exit; zle reset-prompt}
+               vcsh_exit() {vcsh exit; zle reset-prompt;}
                zle -N vcsh_exit
                bindkey '^d' 'vcsh_exit'
        fi
@@ -89,8 +102,10 @@ elif [ "$1" = 'use' ]; then
        return 0
 
 elif [ "$1" = 'clone' ]; then
-       export GIT_REMOTE="$2"
-       export REPO_NAME="$3"
+       GIT_REMOTE="$2"
+       REPO_NAME="$3"
+       [[ -z $REPO_NAME ]] && REPO_NAME=$(basename $GIT_REMOTE .git)
+       export REPO_NAME
        export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
        init
 
@@ -100,11 +115,11 @@ elif [ "$1" = 'clone' ]; then
        git fetch
        for i in $(git ls-tree -r origin/master | awk '{print $4}'); do
        [[ -e $i ]] &&
-               echo "$(basename $0): error: $i exists." &&
+               echo "$SELF: error: $i exists." &&
                CONFLICT=1;
        done
        [[ -n $CONFLICT ]] &&
-               echo "$(basename $0): fatal: will stop after fetching and not try to merge!\n" &&
+               echo "$SELF: fatal: will stop after fetching and not try to merge!\n" &&
                exit 3
        git merge origin/master
        vcsh use $REPO_NAME