X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/982d98af49b99f427fb3bc9f837aef7a362cd7b6..eb672cdb05dc0bd6f2b2b1c6b61d2f055abc73c5:/vcsh?ds=inline

diff --git a/vcsh b/vcsh
index 37f25ab..c1b4874 100755
--- a/vcsh
+++ b/vcsh
@@ -5,19 +5,19 @@
 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
-			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
 
-VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 
 debug() {
 	[ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $1"
@@ -144,6 +144,7 @@ elif [ "$1" = 'clone' ]; then
 	done
 	[ "$VCSH_CONFLICT" = '1' ] &&
 		echo "$SELF: fatal: will stop after fetching and not try to merge!\n" &&
+		echo "  Once this situation has been resolved, run 'vcsh run <foo> git pull' to finish cloning.\n" &&
 		exit 3
 	git merge origin/master
 #	vcsh use $REPO_NAME
@@ -151,7 +152,7 @@ elif [ "$1" = 'clone' ]; then
 
 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