Merge pull request #3 from Dieterbe/master

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 5acd515dc422ab8b0dc0ef2d42611dc7db2f67c2..c4423fdb1ae72fd8b27166643d1bd9ea98731f7b 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -74,32 +74,37 @@ leave() {
 if [ "$1" = 'help' ] || [ $# -eq 0 ]; then
        help
        [ "$1" = 'help' ]
 if [ "$1" = 'help' ] || [ $# -eq 0 ]; then
        help
        [ "$1" = 'help' ]

-       return $?
+       exit $?

 
 elif [ "$1" = 'list' ]; then
        for i in $VCSH_BASE/*.git; do
                echo $(basename $i .git)
        done
 
 elif [ "$1" = 'list' ]; then
        for i in $VCSH_BASE/*.git; do
                echo $(basename $i .git)
        done

-       return 0
+       exit 0

 
 elif [ "$1" = 'run' ]; then
        use $2
        shift 2
        "$@"
        leave
 
 elif [ "$1" = 'run' ]; then
        use $2
        shift 2
        "$@"
        leave

-       return 0
+       exit 0

 
 elif [ "$1" = 'use' ]; then
        if [[ -o NO_IGNORE_EOF ]]; then
                export VCSH_NO_IGNORE_EOF=1
                setopt IGNORE_EOF
 
 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
        use $2
        buildPS1
                zle -N vcsh_exit
                bindkey '^d' 'vcsh_exit'
        fi
        use $2
        buildPS1

-       return 0
+       exit 0

 
 elif [ "$1" = 'clone' ]; then
        GIT_REMOTE="$2"
 
 elif [ "$1" = 'clone' ]; then
        GIT_REMOTE="$2"


@@ -137,11 +142,11 @@ elif [ "$1" = 'exit' ]; then
        fi
        leave
        buildPS1
        fi
        leave
        buildPS1

-       return 0
+       exit 0

 
 else
        help
 
 else
        help

-       return 3
+       exit 3

 
 fi
 
 
 fi