X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/fe0993a7947fc20b567e3dc6bd57f0eda5c49a01..ad4b54c8f747b631a9fc7b14a88509debb2799bd:/vcsh?ds=sidebyside

diff --git a/vcsh b/vcsh
index 59c4237..16bfa53 100755
--- a/vcsh
+++ b/vcsh
@@ -35,13 +35,17 @@ verbose() {
 	if [ -n "$VCSH_DEBUG" ] || [ -n "$VCSH_VERBOSE" ]; then echo "$SELF: verbose: $@"; fi
 }
 
-error () {
+fatal() {
+	echo "$SELF: fatal: $1" >&2
+	exit $2
+}
+
+error() {
 	echo "$SELF: error: $1" >&2
 }
 
-fatal () {
-	echo "$SELF: fatal error: $1" >&2
-	exit $2
+info() {
+	echo "$SELF: info: $1"
 }
 
 setup() {
@@ -54,10 +58,10 @@ setup() {
 
 init() {
 	verbose "init() begin"
-	[ ! -e "$GIT_DIR" ] || fatal "$GIT_DIR exists" 10
+	[ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
 	export GIT_WORK_TREE="$HOME"
 	mkdir -p "$GIT_WORK_TREE"
-	cd "$GIT_WORK_TREE" || fatal "could not enter $GIT_WORK_TREE" 11
+	cd "$GIT_WORK_TREE" || fatal "could not enter '$GIT_WORK_TREE'" 11
 	cd "$GIT_WORK_TREE"
 	git init
 	setup
@@ -118,10 +122,10 @@ for check_directory in "$VCSH_BASE" "$HOME/.gitignore.d"
 do
 	if [ ! -d "$check_directory" ]; then
 		if [ -e "$check_directory" ]; then
-			fatal "$check_directory exists but is not a directory" 13
+			fatal "'$check_directory' exists but is not a directory" 13
 		else
-			echo "$SELF: info: attempting to create $check_directory"
-			mkdir -p "$check_directory" || fatal "could not create $check_directory" 50
+			info "attempting to create '$check_directory'"
+			mkdir -p "$check_directory" || fatal "could not create '$check_directory'" 50
 		fi
 	fi
 done
@@ -136,12 +140,12 @@ if [ "$VCSH_COMMAND" = 'clone' ]; then
 	git fetch
 	for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
 		[ -e "$object" ] &&
-			error "$object exists." &&
+			error "'$object' exists." &&
 			VCSH_CONFLICT=1;
 	done
 	[ "$VCSH_CONFLICT" = '1' ] &&
 		fatal "will stop after fetching and not try to merge!
-  Once this situation has been resolved, run 'vcsh run <foo> git pull' to finish cloning.\n" 17
+  Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning.\n" 17
 	git merge origin/master
 	verbose "clone end"
 
@@ -154,7 +158,7 @@ elif [ "$VCSH_COMMAND" = 'delete' ]; then
 	old_dir="$PWD"
 	cd "$HOME"
 	use || exit $?
-	echo "$SELF: info: This operation WILL DETROY DATA!"
+	info "This operation WILL DETROY DATA!"
 	files=$(git ls-files)
 	echo "These files will be deleted:
 
@@ -165,9 +169,9 @@ To continue, type \"Yes, do as I say\""
 	read answer
 	[ "x$answer" = "xYes, do as I say" ] || exit 16
 	for file in $files; do
-		rm -f $file || echo "$SELF: info: could not delete '$file', continuing with deletion"
+		rm -f $file || info "could not delete '$file', continuing with deletion"
 	done
-	rm -rf "$GIT_DIR" || echo "$SELF: info: could not delete '$GIT_DIR'"
+	rm -rf "$GIT_DIR" || info "could not delete '$GIT_DIR'"
 	cd "$old_dir"
 	verbose "delete end"
 
@@ -219,12 +223,12 @@ elif [ "$VCSH_COMMAND" = 'seed-gitignore' ]; then
 		rm -f "$tempfile" &&
 		exit
 	if [ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ]; then
-		echo "$SELF: info: $HOME/.gitignore.d/$VCSH_REPO_NAME differs from new data, moving it to $HOME/.gitignore.d/$VCSH_REPO_NAME.bak"
+		info "'$HOME/.gitignore.d/$VCSH_REPO_NAME' differs from new data, moving it to '$HOME/.gitignore.d/$VCSH_REPO_NAME.bak'"
 		mv -f "$HOME/.gitignore.d/$VCSH_REPO_NAME" "$HOME/.gitignore.d/$VCSH_REPO_NAME.bak" ||
-			fatal "could not move $HOME/.gitignore.d/$VCSH_REPO_NAME to $HOME/.gitignore.d/$VCSH_REPO_NAME.bak" 53
+			fatal "could not move '$HOME/.gitignore.d/$VCSH_REPO_NAME' to '$HOME/.gitignore.d/$VCSH_REPO_NAME.bak'" 53
 	fi
 	mv -f "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" ||
-		fatal "could not move $tempfile to $HOME/.gitignore.d/$VCSH_REPO_NAME" 53
+		fatal "could not move '$tempfile' to '$HOME/.gitignore.d/$VCSH_REPO_NAME'" 53
 	cd "$old_dir"
 	verbose "seed-gitignore end"