X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/1588d3349f76052c29b9767e14ef74b8f672e8be..9a55a9d5b41d871b9194eed0fbaa115f084d0e32:/vcsh

diff --git a/vcsh b/vcsh
index eb852a0..4e99718 100755
--- a/vcsh
+++ b/vcsh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ "$VCSH_DEBUG" -gt 0 ] && set -x
+[ "$VCSH_DEBUG" = '1' ] && set -x
 
 SELF=$(basename $0)
 
@@ -20,11 +20,11 @@ done
 VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 
 debug() {
-	[ -n "$VCSH_DEBUG" ] && echo "$SELF: debug: $1"
+	[ "$VCSH_DEBUG" = '1' ] && echo "$SELF: debug: $1"
 }
 
 verbose() {
-	if [ -n "$VCSH_DEBUG" ] || [ -n "$VCSH_VERBOSE" ]; then echo "$SELF: verbose: $1"; fi
+	if [ "$VCSH_DEBUG" = '1' ] || [ "$VCSH_VERBOSE" = '1' ]; then echo "$SELF: verbose: $1"; fi
 }
 
 help() {
@@ -46,7 +46,7 @@ help() {
 }
 
 use() {
-	verbose "use() start"
+	verbose "use() begin"
 	REPO_NAME="$1"
 	GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
 
@@ -58,11 +58,11 @@ use() {
 	export GIT_DIR
 	export GIT_WORK_TREE="$(git config --get core.worktree)"
 	export VCSH_DIRECTORY="$REPO_NAME"
-	verbose "use() stop"
+	verbose "use() end"
 }
 
 init() {
-	verbose "init() start"
+	verbose "init() begin"
 	[ -e "$GIT_DIR" ] &&
 		echo "$SELF: fatal: $GIT_DIR exists" &&
 		return 21
@@ -74,7 +74,7 @@ init() {
 	cd $GIT_WORK_TREE
 	git init
 	git config core.worktree $GIT_WORK_TREE
-	verbose "init() stop"
+	verbose "init() end"
 }
 
 leave() {
@@ -89,24 +89,24 @@ if [ "$1" = 'help' ] || [ "$#" -eq 0 ]; then
 	exit $?
 
 elif [ "$1" = 'list' ]; then
-	verbose "list start"
+	verbose "list begin"
 	for i in $VCSH_BASE/*.git; do
 		echo $(basename $i .git)
 	done
-	verbose "list stop"
+	verbose "list end"
 	exit 0
 
 elif [ "$1" = 'run' ]; then
-	verbose "run start"
+	verbose "run begin"
 	use $2
 	shift 2
 	"$@"
 	leave
-	verbose "run start"
+	verbose "run end"
 	exit 0
 
 elif [ "$1" = 'use' ]; then
-	verbose "use start"
+	verbose "use begin"
 	if [ -n "$ZSH_VERSION" ]; then
 		if [ -o NO_IGNORE_EOF ]; then
 			export VCSH_NO_IGNORE_EOF=1
@@ -121,11 +121,11 @@ elif [ "$1" = 'use' ]; then
 	fi
 	use $2
 	[ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
-	verbose "use stop"
+	verbose "use end"
 	exit 0
 
 elif [ "$1" = 'clone' ]; then
-	verbose "clone start"
+	verbose "clone begin"
 	GIT_REMOTE="$2"
 	REPO_NAME="$3"
 	[ -z "$REPO_NAME" ] && REPO_NAME=$(basename $GIT_REMOTE .git)
@@ -142,7 +142,7 @@ elif [ "$1" = 'clone' ]; then
 			echo "$SELF: error: $object exists." &&
 			VCSH_CONFLICT=1;
 	done
-	[ -n "$VCSH_CONFLICT" ] &&
+	[ "$VCSH_CONFLICT" = '1' ] &&
 		echo "$SELF: fatal: will stop after fetching and not try to merge!\n" &&
 		exit 3
 	git merge origin/master
@@ -150,22 +150,22 @@ elif [ "$1" = 'clone' ]; then
 	verbose "clone end"
 
 elif [ "$1" = 'init' ]; then
-	verbose "init start"
+	verbose "init begin"
 	export REPO_NAME="$2"
 	export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
 	init
 	vcsh use $REPO_NAME
-	verbose "init stop"
+	verbose "init end"
 
 elif [ "$1" = 'exit' ]; then
-	verbose "exit start"
-	if [ -n "$ZSH_VERSION" ] && [ -n "$VCSH_NO_IGNORE_EOF" ]; then
+	verbose "exit begin"
+	if [ -n "$ZSH_VERSION" ] && [ "$VCSH_NO_IGNORE_EOF" = '1' ]; then
 		unset VCSH_NO_IGNORE_EOF
 		setopt NO_IGNORE_EOF
 	fi
 	leave
 	[ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
-	verbose "exit stop"
+	verbose "exit end"
 	exit 0
 
 else