Force temporary file/directory removal

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 7004cdff6904a3068c9e6b842fe6b915d07a3ad9..fb1c091879fbb3e05ccac0e597ac06046e617fd2 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -287,16 +287,35 @@ retire() {
 list_untracked() {
        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
+       git init -q
+       mktemp -p $(pwd) > /dev/null
+       git add .
+       git commit -q -m "dummy"
+       )
+       
+       export GIT_DIR=$temp_repo/.git
+       git ls-files --others --directory | sort -u > $temp_file_untracked
+       
        for VCSH_REPO_NAME in $(list); do
-               [ -n $ran_once ] && foo="$(comm -12 --nocheck-order $temp_file_others $temp_file_untracked)"
-               echo "$foo" > $temp_file_untracked
-#              [ -n $ran_once ] && files_untracked=$(printf '%s\n' "$files_untracked" | grep -Fx "$files_other")
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
-               git ls-files --others | sort -u > $temp_file_others
-               [ -z "$ran_once" ] && { ran_once=1; cp $temp_file_others $temp_file_untracked; }
+               git ls-files --others --directory | (
+                       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
+               comm -12 --nocheck-order $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
        done
        cat $temp_file_untracked
-       rm $temp_file_others $temp_file_untracked || 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() {