Make vcsh heed $VCSH_BASE if already defined

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 37f25abfe21cf39d112cc516ceec6f19403d3fdc..7f475fe22b0b2ec256311e11af3e48d0595ac80b 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -5,19 +5,19 @@
 SELF=$(basename $0)
 
 [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
 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"
+[ -z "$VCSH_BASE" ]       && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
+for check_directory in "$VCSH_BASE"

 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
 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)
+                       mkdir -p "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2)

                fi
        fi
 done
 
                fi
        fi
 done
 

-VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"

 
 debug() {
        [ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $1"
 
 debug() {
        [ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $1"


@@ -151,7 +151,7 @@ elif [ "$1" = 'clone' ]; then
 
 elif [ "$1" = 'init' ]; then
        verbose "init begin"
 
 elif [ "$1" = 'init' ]; then
        verbose "init begin"

-       [ -z $2 ] && help; return 0
+       [ -z $2 ] && help && return 0

        export REPO_NAME="$2"
        export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
        init
        export REPO_NAME="$2"
        export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
        init