X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/2db7eb61c0ba0c9c48f6a0a1b08064c10a6dec8a..15081fe001484b3337b60d0874d7ff4f608c1cc8:/vcsh diff --git a/vcsh b/vcsh index 3d08f22..e3612b7 100755 --- a/vcsh +++ b/vcsh @@ -3,19 +3,20 @@ #set -x SELF=$(basename $0) + [ -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 - - 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 + 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 - 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