Cleanup use() exit scenarios

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 50c1c31c7e63487a28ecb54b1cbaa8085b046527..ee3514167317bbf9abfe682c089e93d37cc9f7a5 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -68,7 +68,7 @@ clone () {
 delete () {
        old_dir="$PWD"
        cd "$HOME"
 delete () {
        old_dir="$PWD"
        cd "$HOME"

-       use || exit $?
+       use

        info "This operation WILL DETROY DATA!"
        files=$(git ls-files)
        echo "These files will be deleted:
        info "This operation WILL DETROY DATA!"
        files=$(git ls-files)
        echo "These files will be deleted:


@@ -87,7 +87,7 @@ To continue, type \"Yes, do as I say\""
 }
 
 enter () {
 }
 
 enter () {

-       use || exit $?
+       use

        $SHELL
 }
 
        $SHELL
 }
 


@@ -108,12 +108,12 @@ list () {
 }
 
 run () {
 }
 
 run () {

-       use || exit $?
+       use

        $VCSH_EXTERNAL_COMMAND
 }
 
 seed_gitignore () {
        $VCSH_EXTERNAL_COMMAND
 }
 
 seed_gitignore () {

-       use || exit $?
+       use

        # Switching directory as this has to be executed from $HOME to be of any use.
        # Going back into old directory at the end in case `vcsh use` is reactivated.
        old_dir="$PWD"
        # Switching directory as this has to be executed from $HOME to be of any use.
        # Going back into old directory at the end in case `vcsh use` is reactivated.
        old_dir="$PWD"


@@ -155,8 +155,7 @@ setup() {
 
 use() {
        if [ ! -d "$GIT_DIR" ]; then
 
 use() {
        if [ ! -d "$GIT_DIR" ]; then

-               error "no repository found for '$VCSH_REPO_NAME'"
-               return 12
+               fatal "no repository found for '$VCSH_REPO_NAME'" 12

        fi
        export GIT_WORK_TREE="$(git config --get core.worktree)"
        export VCSH_DIRECTORY="$VCSH_REPO_NAME"
        fi
        export GIT_WORK_TREE="$(git config --get core.worktree)"
        export VCSH_DIRECTORY="$VCSH_REPO_NAME"