X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/7d795df9abb5a907d480339ac5f3a5030a690510..8b65faf2441f8d2439629bf8a1fa57e3edc8fe0a:/vcsh?ds=sidebyside

diff --git a/vcsh b/vcsh
index 9736bc6..dd05f0e 100755
--- a/vcsh
+++ b/vcsh
@@ -13,7 +13,7 @@ do
 			echo "$SELF: error: $check_directory exists but is not a directory" >&2
 			exit 2
 		else
-			echo "$SELF: attempting to create $check_directory"
+			echo "$SELF: info: attempting to create $check_directory"
 			mkdir -p "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2)
 		fi
 	fi
@@ -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"
 }
 
@@ -156,7 +158,7 @@ elif [ "$1" = 'clone' ]; then
 
 elif [ "$1" = 'init' ]; then
 	verbose "init begin"
-	[ -z $2 ] && help && echo && echo "$SELF $1: please specify repository to work on" && return 0
+	[ -z $2 ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0
 	export REPO_NAME="$2"
 	export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
 	init
@@ -176,8 +178,12 @@ elif [ "$1" = 'init' ]; then
 
 elif [ "$1" = 'seed-gitignore' ]; then
 	verbose "seed-gitignore begin"
-	[ -z $2 ] && help && echo && echo "$SELF $1: please specify repository to work on" && return 0
+	[ -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
@@ -187,13 +193,14 @@ elif [ "$1" = 'seed-gitignore' ]; then
 			file="$new"
 		done;
 	done | sort -u | sed 's/^/!/')
-	[ -e .gitignore.d/$2 ] &&
-	echo "$SELF: .gitignore.d/$2 exists, moving it to .gitignore.d/$2.bak" &&
-	mv -f .gitignore.d/$2 .gitignore.d/$2.bak
-	echo '*' > .gitignore.d/$2
+	[ -e "$HOME/.gitignore.d/$2" ] &&
+	echo "$SELF: info: $HOME/.gitignore.d/$2 exists, moving it to $HOME/.gitignore.d/$2.bak" &&
+	mv -f "$HOME/.gitignore.d/$2" "$HOME/.gitignore.d/$2.bak"
+	echo '*' > "$HOME/.gitignore.d/$2"
 	for gitignore in $gitignores; do
-		echo $gitignore >> .gitignore.d/$2
+		echo "$gitignore" >> "$HOME/.gitignore.d/$2"
 	done
+	cd "$old_dir"
 
 else
 	verbose "defaulting to calling help()"