]> git.madduck.net Git - code/vcsh.git/blobdiff - vcsh

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Check for existence of 'comm' command
[code/vcsh.git] / vcsh
diff --git a/vcsh b/vcsh
index fb1c091879fbb3e05ccac0e597ac06046e617fd2..cebd7986b70413096fb9bc839996e0bcd902b3d0 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -284,17 +284,23 @@ retire() {
        unset VCSH_DIRECTORY
 }
 
        unset VCSH_DIRECTORY
 }
 
+command_exists() {
+       command -v "$1" >/dev/null 2>&1 || fatal "Could not find '$1' command"
+}
+
 list_untracked() {
 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_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)
+       temp_repo=$(mktemp -d) || fatal 'Could not create temp repo'
        (
        (
-       cd $temp_repo
+       cd $temp_repo || fatal 'Could not cd into temp repo'
        git init -q
        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"
        )
        git add .
        git commit -q -m "dummy"
        )
@@ -310,7 +316,7 @@ list_untracked() {
                                printf '%s/\n' "$(echo "$line" | cut -d'/' -f1)"
                        done
                        ) | sort -u > $temp_file_others
                                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
                comm -12 --nocheck-order $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
        done
        cat $temp_file_untracked