Make seed-gitignore more robust and only update the ignore if needed

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 82a98a1829cca5df22cfd88dc6cd36cc166a8f0a..f4d98ad9c0c0a8c97bdd3a8fc9bd4d4143e53716 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -77,6 +77,8 @@ init() {
        git init
        git config core.worktree     "$GIT_WORK_TREE"
        git config core.excludesfile ".gitignore.d/$REPO_NAME"
        git init
        git config core.worktree     "$GIT_WORK_TREE"
        git config core.excludesfile ".gitignore.d/$REPO_NAME"

+       touch   "$HOME/.gitignore.d/$REPO_NAME"
+       git add "$HOME/.gitignore.d/$REPO_NAME"

        verbose "init() end"
 }
 
        verbose "init() end"
 }
 


@@ -178,6 +180,10 @@ elif [ "$1" = 'seed-gitignore' ]; then
        verbose "seed-gitignore begin"
        [ -z $2 ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0
        use "$2"
        verbose "seed-gitignore begin"
        [ -z $2 ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0
        use "$2"

+       # Switching directory as this has to be executed from $HOME to be of any use.
+       # Going back into old directory at the end in case `vcsh use` is reactivated.
+       old_dir="$PWD"
+       cd "$HOME"

        git config core.excludesfile ".gitignore.d/$REPO_NAME"
        files=$(git ls-files)
        gitignores=$(for file in $(git ls-files); do
        git config core.excludesfile ".gitignore.d/$REPO_NAME"
        files=$(git ls-files)
        gitignores=$(for file in $(git ls-files); do


@@ -187,13 +193,24 @@ elif [ "$1" = 'seed-gitignore' ]; then
                        file="$new"
                done;
        done | sort -u | sed 's/^/!/')
                        file="$new"
                done;
        done | sort -u | sed 's/^/!/')

-       [ -e .gitignore.d/$2 ] &&
-       echo "$SELF: info: .gitignore.d/$2 exists, moving it to .gitignore.d/$2.bak" &&
-       mv -f .gitignore.d/$2 .gitignore.d/$2.bak
-       echo '*' > .gitignore.d/$2
+       tempfile=$(mktemp) ||
+               (echo "$SELF: fatal: could not create tempfile" && exit 1) 
+       echo '*' > "$tempfile"

        for gitignore in $gitignores; do
        for gitignore in $gitignores; do

-               echo $gitignore >> .gitignore.d/$2
+               echo "$gitignore" >> "$tempfile"

        done
        done

+       diff -N "$tempfile" "$HOME/.gitignore.d/$2" > /dev/null &&
+               rm -f "$tempfile" &&
+               return
+       if [ -e "$HOME/.gitignore.d/$2" ]; then
+               echo "$SELF: info: $HOME/.gitignore.d/$2 differs from new data, moving it to $HOME/.gitignore.d/$2.bak"
+               mv -f "$HOME/.gitignore.d/$2" "$HOME/.gitignore.d/$2.bak" ||
+                       (echo "$SELF: fatal: could not move $HOME/.gitignore.d/$2 to $HOME/.gitignore.d/$2.bak" && exit 1)
+       fi
+       mv -f "$tempfile" "$HOME/.gitignore.d/$2" ||
+               (echo "$SELF: fatal: could not move $tempfile to $HOME/.gitignore.d/$2" && exit 1)
+       cd "$old_dir"
+       verbose "seed-gitignore end"

 
 else
        verbose "defaulting to calling help()"
 
 else
        verbose "defaulting to calling help()"