X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/8364333583ce45cc41c334a34d4793276f8bf691..375f7dce708eb327ce00e4421aebd8be7b95155c:/vcsh?ds=inline

diff --git a/vcsh b/vcsh
index 82a98a1..58faf36 100755
--- a/vcsh
+++ b/vcsh
@@ -54,7 +54,7 @@ use() {
 
 	if [ ! -d "$GIT_DIR" ]; then
 		echo E: no repository found for "$REPO_NAME" >&2
-		return 2
+		return 1
 	fi
 
 	export GIT_DIR
@@ -77,6 +77,8 @@ init() {
 	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"
 }
 
@@ -101,7 +103,7 @@ elif [ "$1" = 'list' ]; then
 
 elif [ "$1" = 'run' ]; then
 	verbose "run begin"
-	use "$2"
+	use "$2" || return 1
 	shift 2
 	"$@"
 	leave
@@ -122,7 +124,7 @@ elif [ "$1" = 'run' ]; then
 #		zle -N vcsh_exit
 #		bindkey '^d' 'vcsh_exit'
 #	fi
-#	use $2
+#	use "$2" || return 1
 #	[ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
 #	verbose "use end"
 #	exit 0
@@ -151,7 +153,7 @@ elif [ "$1" = 'clone' ]; then
 		echo "  Once this situation has been resolved, run 'vcsh run <foo> git pull' to finish cloning.\n" &&
 		exit 3
 	git merge origin/master
-#	vcsh use $REPO_NAME
+#	use $REPO_NAME || return 1
 	verbose "clone end"
 
 elif [ "$1" = 'init' ]; then
@@ -160,7 +162,7 @@ elif [ "$1" = 'init' ]; then
 	export REPO_NAME="$2"
 	export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
 	init
-#	vcsh use "$REPO_NAME"
+#	use "$REPO_NAME" || return 1
 	verbose "init end"
 
 #elif [ "$1" = 'exit' ]; then
@@ -177,9 +179,12 @@ elif [ "$1" = 'init' ]; then
 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"
+	use $2 || return 1
+	# 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
 		while true; do
 			echo $file; new="${file%/*}"
@@ -187,13 +192,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()"