X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/9867819bf0fc3882b9ede33462b6d98f10b7535a..d3b04ac4495a6fe1676aa0f2f6b60a93fd6324e1:/vcsh?ds=inline

diff --git a/vcsh b/vcsh
index b10d809..e4f6f33 100755
--- a/vcsh
+++ b/vcsh
@@ -30,7 +30,7 @@ fatal() {
 # We need to run getops as soon as possible so we catch -d and other
 # options that will modify our behaviour.
 # Commands are handled at the end of this script.
-while getopts "c:dv" flag; do
+while getopts "c:dvr" flag; do
 	if [ x"$1" = x'-d' ] || [ x"$1" = x'--debug' ]; then
 		set -vx
 		VCSH_DEBUG=1
@@ -40,6 +40,8 @@ while getopts "c:dv" flag; do
 		VCSH_VERBOSE=1
 		echo "verbose mode on"
 		echo "$SELF $VERSION"
+	elif [ x"$1" = x'-r' ]; then
+		VCSH_OPTION_RECURSIVE=1
 	elif [ x"$1" = x'-c' ]; then
 		VCSH_OPTION_CONFIG=$OPTARG
 	fi
@@ -284,37 +286,48 @@ retire() {
 	unset VCSH_DIRECTORY
 }
 
+command_exists() {
+	command -v "$1" >/dev/null 2>&1 || fatal "Could not find '$1' command"
+}
+
 list_untracked() {
+	command_exists comm
+
 	temp_file_others=$(mktemp) || fatal 'Could not create temp file'
 	temp_file_untracked=$(mktemp) || fatal 'Could not create temp file'
 	temp_file_untracked_copy=$(mktemp) || fatal 'Could not create temp file'
 	
 	# create dummy git repo
-	temp_repo=$(mktemp -d)
-	(
-	cd $temp_repo
+	temp_repo=$(mktemp -d) || fatal 'Could not create temp repo'
+
+	cd $temp_repo || fatal 'Could not cd into temp repo'
 	git init -q
-	mktemp -p $(pwd) > /dev/null
+	mktemp -q -p $(pwd) > /dev/null || fatal 'Could not create dummy file'
 	git add .
 	git commit -q -m "dummy"
-	)
-	
+	cd - > /dev/null 2>&1 || fatal 'Could not cd back'
+
+	[ -z "$VCSH_OPTION_RECURSIVE" ] && directory_opt="--directory"
+
 	export GIT_DIR=$temp_repo/.git
-	git ls-files --others --directory | sort -u > $temp_file_untracked
-	
+	git ls-files --others "$directory_opt" | sort -u > $temp_file_untracked
+
 	for VCSH_REPO_NAME in $(list); do
 		export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
-		git ls-files --others --directory | (
+		git ls-files --others "$directory_opt" | (
 			while read line; do
 				echo "$line"
 				printf '%s/\n' "$(echo "$line" | cut -d'/' -f1)"
 			done
 			) | sort -u > $temp_file_others
-		cp $temp_file_untracked $temp_file_untracked_copy
+		cp $temp_file_untracked $temp_file_untracked_copy || fatal 'Could not copy temp file'
 		comm -12 --nocheck-order $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
 	done
 	cat $temp_file_untracked
-	rm -r $temp_file_others $temp_file_untracked $temp_file_untracked_copy $temp_repo || fatal 'Could not delete temp file'
+	
+	unset directory_opt
+	rm -f $temp_file_others $temp_file_untracked $temp_file_untracked_copy || fatal 'Could not delete temp files'
+	rm -rf $temp_repo || fatal 'Could not delete temp repo'
 }
 
 rename() {