X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/9867819bf0fc3882b9ede33462b6d98f10b7535a..798d70b901cf63afde2eb05794791a5c943c4c51:/vcsh?ds=sidebyside

diff --git a/vcsh b/vcsh
index b10d809..279de43 100755
--- a/vcsh
+++ b/vcsh
@@ -284,20 +284,26 @@ 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'
 	
 	export GIT_DIR=$temp_repo/.git
 	git ls-files --others --directory | sort -u > $temp_file_untracked
@@ -310,11 +316,12 @@ list_untracked() {
 				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'
+	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() {