X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/67a1a55913e80ce2e97d4f7b389793f4afb33dc6..de1c75a12e9f0f586b1973d3866ad4707d263a08:/vcsh

diff --git a/vcsh b/vcsh
index 3642ad5..a374f05 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:dvr" flag; do
+while getopts "c:dv" flag; do
 	if [ x"$1" = x'-d' ] || [ x"$1" = x'--debug' ]; then
 		set -vx
 		VCSH_DEBUG=1
@@ -40,8 +40,6 @@ while getopts "c:dvr" 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
@@ -286,18 +284,22 @@ retire() {
 	unset VCSH_DIRECTORY
 }
 
-command_exists() {
-	command -v "$1" >/dev/null 2>&1 || fatal "Could not find '$1' command"
-}
-
 list_untracked() {
-	command_exists comm
+	command -v 'comm' >/dev/null 2>&1 || fatal "Could not find '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'
+	temp_file_others=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
+	temp_file_untracked=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
+	temp_file_untracked_copy=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
 
-	[ -z "$VCSH_OPTION_RECURSIVE" ] && directory_opt="--directory"
+	# Hack in support for `vcsh list-untracked -r`
+	directory_opt="--directory"
+	shift 1
+	while getopts "r" flag; do
+		if [ x"$1" = x'-r' ]; then
+			unset directory_opt
+		fi
+		shift 1
+	done
 
 	for VCSH_REPO_NAME in $(list); do
 		export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
@@ -316,7 +318,7 @@ list_untracked() {
 		comm -12 --nocheck-order $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
 	done
 	cat $temp_file_untracked
-	
+
 	unset directory_opt directory_component
 	rm -f $temp_file_others $temp_file_untracked $temp_file_untracked_copy || fatal 'Could not delete temp files'
 }