Don't use subshell when creating the temporary repo

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index b10d80956395ea61a11f19c539349bcc95e46998..279de43c2118baeb669c1bbeffcc2c16734625ee 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -284,20 +284,26 @@ 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)
-       (
-       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
        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"

-       )
+       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
        
        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
                                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

-       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() {
 }
 
 rename() {