Quit vcsh if repo can not be found

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 6de5f56722277741a9caf8ade2a0e97806eb6c4d..58faf367b390227377298f4bbcd8ce2a1f76afbb 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -6,13 +6,14 @@ SELF=$(basename $0)
 
 [ -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"

-for check_directory in "$VCSH_BASE"
+for check_directory in "$VCSH_BASE" "$HOME/.gitignore.d"

 do
        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
 do
        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

+                       echo "$SELF: info: attempting to create $check_directory"

                        mkdir -p "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2)
                fi
        fi
                        mkdir -p "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2)
                fi
        fi


@@ -53,7 +54,7 @@ use() {
 
        if [ ! -d "$GIT_DIR" ]; then
                echo E: no repository found for "$REPO_NAME" >&2
 
        if [ ! -d "$GIT_DIR" ]; then
                echo E: no repository found for "$REPO_NAME" >&2

-               return 2
+               return 1

        fi
 
        export GIT_DIR
        fi
 
        export GIT_DIR


@@ -76,6 +77,8 @@ init() {
        git init
        git config core.worktree     "$GIT_WORK_TREE"
        git config core.excludesfile ".gitignore.d/$REPO_NAME"
        git init
        git config core.worktree     "$GIT_WORK_TREE"
        git config core.excludesfile ".gitignore.d/$REPO_NAME"

+       touch   "$HOME/.gitignore.d/$REPO_NAME"
+       git add "$HOME/.gitignore.d/$REPO_NAME"

        verbose "init() end"
 }
 
        verbose "init() end"
 }
 


@@ -100,7 +103,7 @@ elif [ "$1" = 'list' ]; then
 
 elif [ "$1" = 'run' ]; then
        verbose "run begin"
 
 elif [ "$1" = 'run' ]; then
        verbose "run begin"

-       use "$2"
+       use "$2" || return 1

        shift 2
        "$@"
        leave
        shift 2
        "$@"
        leave


@@ -121,7 +124,7 @@ elif [ "$1" = 'run' ]; then
 #              zle -N vcsh_exit
 #              bindkey '^d' 'vcsh_exit'
 #      fi
 #              zle -N vcsh_exit
 #              bindkey '^d' 'vcsh_exit'
 #      fi

-#      use $2
+#      use "$2" || return 1

 #      [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
 #      verbose "use end"
 #      exit 0
 #      [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
 #      verbose "use end"
 #      exit 0


@@ -150,16 +153,16 @@ elif [ "$1" = 'clone' ]; then
                echo "  Once this situation has been resolved, run 'vcsh run <foo> git pull' to finish cloning.\n" &&
                exit 3
        git merge origin/master
                echo "  Once this situation has been resolved, run 'vcsh run <foo> git pull' to finish cloning.\n" &&
                exit 3
        git merge origin/master

-#      vcsh use $REPO_NAME
+#      use $REPO_NAME || return 1

        verbose "clone end"
 
 elif [ "$1" = 'init' ]; then
        verbose "init begin"
        verbose "clone end"
 
 elif [ "$1" = 'init' ]; then
        verbose "init begin"

-       [ -z $2 ] && help && echo && echo "$SELF $1: please specify repository to work on" && return 0
+       [ -z $2 ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0

        export REPO_NAME="$2"
        export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
        init
        export REPO_NAME="$2"
        export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
        init

-#      vcsh use "$REPO_NAME"
+#      use "$REPO_NAME" || return 1

        verbose "init end"
 
 #elif [ "$1" = 'exit' ]; then
        verbose "init end"
 
 #elif [ "$1" = 'exit' ]; then


@@ -175,10 +178,13 @@ elif [ "$1" = 'init' ]; then
 
 elif [ "$1" = 'seed-gitignore' ]; then
        verbose "seed-gitignore begin"
 
 elif [ "$1" = 'seed-gitignore' ]; then
        verbose "seed-gitignore begin"

-       [ -z $2 ] && help && echo && echo "$SELF $1: please specify repository to work on" && return 0
-       use "$2"
+       [ -z $2 ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0
+       use $2 || return 1
+       # 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"
+       cd "$HOME"

        git config core.excludesfile ".gitignore.d/$REPO_NAME"
        git config core.excludesfile ".gitignore.d/$REPO_NAME"

-       files=$(git ls-files)

        gitignores=$(for file in $(git ls-files); do
                while true; do
                        echo $file; new="${file%/*}"
        gitignores=$(for file in $(git ls-files); do
                while true; do
                        echo $file; new="${file%/*}"


@@ -186,13 +192,24 @@ elif [ "$1" = 'seed-gitignore' ]; then
                        file="$new"
                done;
        done | sort -u | sed 's/^/!/')
                        file="$new"
                done;
        done | sort -u | sed 's/^/!/')

-       [ -e .gitignore.d/$2 ] &&
-       echo "$SELF: .gitignore.d/$2 exists, moving it to .gitignore.d/$2.bak" &&
-       mv -f .gitignore.d/$2 .gitignore.d/$2.bak
-       echo '*' > .gitignore.d/$2
+       tempfile=$(mktemp) ||
+               (echo "$SELF: fatal: could not create tempfile" && exit 1) 
+       echo '*' > "$tempfile"

        for gitignore in $gitignores; do
        for gitignore in $gitignores; do

-               echo $gitignore >> .gitignore.d/$2
+               echo "$gitignore" >> "$tempfile"

        done
        done

+       diff -N "$tempfile" "$HOME/.gitignore.d/$2" > /dev/null &&
+               rm -f "$tempfile" &&
+               return
+       if [ -e "$HOME/.gitignore.d/$2" ]; then
+               echo "$SELF: info: $HOME/.gitignore.d/$2 differs from new data, moving it to $HOME/.gitignore.d/$2.bak"
+               mv -f "$HOME/.gitignore.d/$2" "$HOME/.gitignore.d/$2.bak" ||
+                       (echo "$SELF: fatal: could not move $HOME/.gitignore.d/$2 to $HOME/.gitignore.d/$2.bak" && exit 1)
+       fi
+       mv -f "$tempfile" "$HOME/.gitignore.d/$2" ||
+               (echo "$SELF: fatal: could not move $tempfile to $HOME/.gitignore.d/$2" && exit 1)
+       cd "$old_dir"
+       verbose "seed-gitignore end"

 
 else
        verbose "defaulting to calling help()"
 
 else
        verbose "defaulting to calling help()"