Merge branch 'master' of github.com:RichiH/vcsh

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index d05f26956bc7f55bafb5c0e76db0751303c1b2d8..8ca079a05fc232786ce6afaaac444a31c6590725 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/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"
 
 [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
 [ -z "$VCSH_BASE" ]       && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 


@@ -199,17 +199,8 @@ 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"
        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"

-       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" = 'run' ] && shift 2 && export VCSH_EXTERNAL_COMMAND="$*"

        [ "$VCSH_COMMAND" = 'seed-gitignore' ]
        [ "$VCSH_COMMAND" = 'seed-gitignore' ]

-#      [ "$VCSH_COMMAND" = 'seed-gitignore' ] && export VCSH_COMMAND='seed_gitignore'

 elif [ "$1" = 'list' ]; then
        export VCSH_COMMAND="$1"
 elif [ -n "$1" ]; then
 elif [ "$1" = 'list' ]; then
        export VCSH_COMMAND="$1"
 elif [ -n "$1" ]; then


@@ -224,6 +215,14 @@ else
        help && exit
 fi
 
        help && exit
 fi
 

+# 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
+
+

 for check_directory in "$VCSH_BASE" "$HOME/.gitignore.d"
 do
        if [ ! -d "$check_directory" ]; then
 for check_directory in "$VCSH_BASE" "$HOME/.gitignore.d"
 do
        if [ ! -d "$check_directory" ]; then