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

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 3d08f227ab68ff776850be232ab3f4e5b1aba062..e3612b72520aeaac75bbd8e5073f3b6546f53415 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -3,19 +3,20 @@
 #set -x
 
 SELF=$(basename $0)
 #set -x
 
 SELF=$(basename $0)

+

 [ -z $XDG_CONFIG_HOME ] && XDG_CONFIG_HOME="$HOME/.config"
 [ -z $XDG_CONFIG_HOME ] && XDG_CONFIG_HOME="$HOME/.config"

-for dir in $XDG_CONFIG_HOME $XDG_CONFIG_HOME/vcsh $XDG_CONFIG_HOME/vcsh/repo.d
+for check_directory in $XDG_CONFIG_HOME $XDG_CONFIG_HOME/vcsh $XDG_CONFIG_HOME/vcsh/repo.d

 do
 do

-
-    if [ ! -d $dir ]; then
-        if [ -e $dir ]; then
-            echo "$SELF: error: $dir exists but is not a directory" >&2
-            return 2
-        else
-            mkdir $dir || (echo "$SELF: error: could not create $dir" >&2; return 2)
-        fi  
-    fi
+       if [ ! -d $check_directory ]; then
+               if [ -e $check_directory ]; then
+                       echo "$SELF: error: $check_directory exists but is not a directory" >&2
+                       exit 2
+               else
+                       mkdir $check_directory || (echo "$SELF: error: could not create $check_directory" >&2; exit 2)
+               fi
+       fi

 done
 done

+

 VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 
 help() {
 VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 
 help() {


@@ -92,7 +93,12 @@ elif [ "$1" = 'use' ]; then
        if [[ -o NO_IGNORE_EOF ]]; then
                export VCSH_NO_IGNORE_EOF=1
                setopt IGNORE_EOF
        if [[ -o NO_IGNORE_EOF ]]; then
                export VCSH_NO_IGNORE_EOF=1
                setopt IGNORE_EOF

-               vcsh_exit() {vcsh exit; zle reset-prompt;}
+               if [[ -n $ZSH_VERSION ]]; then
+                       vcsh_exit() {
+                               vcsh exit;
+                               zle reset-prompt;
+                       }
+               fi

                zle -N vcsh_exit
                bindkey '^d' 'vcsh_exit'
        fi
                zle -N vcsh_exit
                bindkey '^d' 'vcsh_exit'
        fi