Improve seeg-gitignore to work around git's issues; still not happy

diff --git a/vcsh b/vcsh
index bcd416c37724b868157a465d90a9a757dd15bef9..d583dbc1a4ec1d0f8966fed25134f6f7aa497feb 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -214,12 +214,13 @@ elif [ "$VCSH_COMMAND" = 'seed-gitignore' ]; then
                        [ "$file" = "$new" ] && break
                        file="$new"
                done;
                        [ "$file" = "$new" ] && break
                        file="$new"
                done;

-       done | sort -u | sed 's/^/!/')
+       done | sort -u)

        tempfile=$(mktemp) ||
                (echo "$SELF: fatal: could not create tempfile" && exit 1) 
        echo '*' > "$tempfile"
        for gitignore in $gitignores; do
        tempfile=$(mktemp) ||
                (echo "$SELF: fatal: could not create tempfile" && exit 1) 
        echo '*' > "$tempfile"
        for gitignore in $gitignores; do

-               echo "$gitignore" >> "$tempfile"
+               echo "$gitignore" | sed 's/^/!/' >> "$tempfile"
+               [ -d "$gitignore" ] && echo "$gitignore/*" | sed 's/^/!/'>> "$tempfile"

        done
        diff -N "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" > /dev/null &&
                rm -f "$tempfile" &&
        done
        diff -N "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" > /dev/null &&
                rm -f "$tempfile" &&