X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/4b21d241422c84a3cd54cdd19e59c5110c2908f2..5314563bc7d91f82d74478d42a100ffdd399ceb2:/vcsh

diff --git a/vcsh b/vcsh
index 3c8d083..665c61a 100755
--- a/vcsh
+++ b/vcsh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -n "$VCSH_DEBUG" ]      && set -x
+[ -n "$VCSH_DEBUG" ]      && set -vx
 [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
 [ -z "$VCSH_BASE" ]       && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 
@@ -110,6 +110,18 @@ list() {
 	done
 }
 
+#get_files() {
+#	return $(git ls-files)
+#}
+#
+#list_tracked_all() {
+#	use
+#	for repo in $(list); do
+#		files="$files $(get_files $repo)"
+#	done
+#	echo $files | sort -u
+#}
+
 rename() {
 	git_dir_exists
 	[ -d "$GIT_DIR_NEW" ] && fatal "'$GIT_DIR_NEW' exists" 54
@@ -136,9 +148,9 @@ seed_gitignore() {
 	echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
 	for gitignore in $gitignores; do
 		echo "$gitignore" | sed 's/^/!/' >> "$tempfile" || fatal "could not write to '$tempfile'" 57
-		[ -d "$gitignore" ] && echo "$gitignore/*" | sed 's/^/!/'>> "$tempfile" || fatal "could not write to '$tempfile'" 57
+		[ -d "$gitignore" ] && { echo "$gitignore/*" | sed 's/^/!/' >> "$tempfile" || fatal "could not write to '$tempfile'" 57; }
 	done
-	if [ diff -N "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" > /dev/null ]; then
+	if diff -N "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" > /dev/null; then
 		rm -f "$tempfile" || error "could not delete '$tempfile'"
 		exit
 	fi
@@ -156,8 +168,7 @@ setup() {
 	git config core.worktree     "$GIT_WORK_TREE"
 	git config core.excludesfile ".gitignore.d/$VCSH_REPO_NAME"
 	git config vcsh.vcsh         'true'
-	touch   "$HOME/.gitignore.d/$VCSH_REPO_NAME" || error "could not touch '$HOME/.gitignore.d/$VCSH_REPO_NAME'"
-	git add "$HOME/.gitignore.d/$VCSH_REPO_NAME"
+	[ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ] && git add -f "$HOME/.gitignore.d/$VCSH_REPO_NAME"
 }
 
 use() {
@@ -176,6 +187,7 @@ if [ "$1" = 'clone' ]; then
 elif [ "$1" = 'delete' ] ||
      [ "$1" = 'enter' ] ||
      [ "$1" = 'init' ] ||
+     [ "$1" = 'list-tracked-all' ] ||
      [ "$1" = 'rename' ] ||
      [ "$1" = 'run' ] ||
      [ "$1" = 'seed-gitignore' ] ||
@@ -187,8 +199,16 @@ elif [ "$1" = 'delete' ] ||
 	export VCSH_REPO_NAME="$2"
 	export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git"
 	[ "$VCSH_COMMAND" = 'rename' ]         && export GIT_DIR_NEW="$VCSH_BASE/$3.git"
-	[ "$VCSH_COMMAND" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$@"
-	[ "$VCSH_COMMAND" = 'seed-gitignore' ] && export VCSH_COMMAND='seed_gitignore'
+	if [ "$VCSH_COMMAND" = 'run' ]; then
+		shift 2
+		export VCSH_EXTERNAL_COMMAND="$*"
+		# Did we receive a directory instead of a name? Mangle the input to fit normal operation!
+		if echo $VCSH_REPO_NAME | grep -q '/'; then
+			export GIT_DIR=$VCSH_REPO_NAME
+			export VCSH_REPO_NAME=$(basename $VCSH_REPO_NAME .git)
+		fi
+	fi
+	[ "$VCSH_COMMAND" = 'seed-gitignore' ]
 elif [ "$1" = 'list' ]; then
 	export VCSH_COMMAND="$1"
 elif [ -n "$1" ]; then
@@ -216,5 +236,6 @@ do
 done
 
 verbose "$VCSH_COMMAND begin"
+export VCSH_COMMAND=$(echo $VCSH_COMMAND | sed 's/-/_/g')
 $VCSH_COMMAND
 verbose "$VCSH_COMMAND end, exiting"