X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/e11ef008517996497ba413813c2fa756ac22f122..ab4b010d18cec61ad662c71841f35d0525bf2b99:/vcsh?ds=sidebyside

diff --git a/vcsh b/vcsh
index bb04b29..f4d98ad 100755
--- a/vcsh
+++ b/vcsh
@@ -180,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"
+	# 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
@@ -189,13 +193,24 @@ elif [ "$1" = 'seed-gitignore' ]; then
 			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
-		echo $gitignore >> .gitignore.d/$2
+		echo "$gitignore" >> "$tempfile"
 	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()"