Re-arrange functions

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 6fa6644aaed8b2462fe7070f53451ae12197675b..cb9f216b7a96a869c3656c2f1ddfc4bee5b1ca5f 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -5,6 +5,13 @@
 [ -z "$VCSH_BASE" ]       && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 
 SELF=$(basename $0)
 [ -z "$VCSH_BASE" ]       && VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 
 SELF=$(basename $0)

+if [ "$SELF" = 'bash' ] ||
+   [ "$SELF" = 'dash' ] ||
+   [ "$SELF" = 'sh' ] ||
+   [ "$SELF" = 'zsh' ]; then
+       SELF='vcsh'
+       VCSH_SOURCED=1
+fi

 
 
 help() {
 
 
 help() {


@@ -14,6 +21,7 @@ help() {
          [<repo>]       Clone from an existing repository
    help                 Display this help text
    delete               Delete an existing repository
          [<repo>]       Clone from an existing repository
    help                 Display this help text
    delete               Delete an existing repository

+   enter                Enter repository; spawn new $SHELL

    exit                 Exit repository; unset ENV
    init <repo>          Initialize a new repository
    list                 List all repositories
    exit                 Exit repository; unset ENV
    init <repo>          Initialize a new repository
    list                 List all repositories


@@ -36,18 +44,6 @@ verbose() {
        if [ -n "$VCSH_DEBUG" ] || [ -n "$VCSH_VERBOSE" ]; then echo "$SELF: verbose: $@"; fi
 }
 
        if [ -n "$VCSH_DEBUG" ] || [ -n "$VCSH_VERBOSE" ]; then echo "$SELF: verbose: $@"; fi
 }
 

-use() {
-       verbose "use() begin"
-       if [ ! -d "$GIT_DIR" ]; then
-               echo E: no repository found for "$VCSH_REPO_NAME" >&2
-               return 1
-       fi
-       export GIT_DIR
-       export GIT_WORK_TREE="$(git config --get core.worktree)"
-       export VCSH_DIRECTORY="$VCSH_REPO_NAME"
-       verbose "use() end"
-}
-

 init() {
        verbose "init() begin"
        [ -e "$GIT_DIR" ] &&
 init() {
        verbose "init() begin"
        [ -e "$GIT_DIR" ] &&


@@ -73,8 +69,21 @@ leave() {
        unset VCSH_DIRECTORY
 }
 
        unset VCSH_DIRECTORY
 }
 

+use() {
+       verbose "use() begin"
+       if [ ! -d "$GIT_DIR" ]; then
+               echo E: no repository found for "$VCSH_REPO_NAME" >&2
+               return 1
+       fi
+       export GIT_DIR
+       export GIT_WORK_TREE="$(git config --get core.worktree)"
+       export VCSH_DIRECTORY="$VCSH_REPO_NAME"
+       verbose "use() end"
+}
+

 
 if [ "$1" = 'clone' ]; then
 
 if [ "$1" = 'clone' ]; then

+       export VCSH_COMMAND="$1"

        GIT_REMOTE="$2"
        export GIT_REMOTE
        VCSH_REPO_NAME="$3"
        GIT_REMOTE="$2"
        export GIT_REMOTE
        VCSH_REPO_NAME="$3"


@@ -82,6 +91,7 @@ if [ "$1" = 'clone' ]; then
        export VCSH_REPO_NAME
        export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git"
 elif [ "$1" = 'delete' ] ||
        export VCSH_REPO_NAME
        export GIT_DIR="$VCSH_BASE/$VCSH_REPO_NAME.git"
 elif [ "$1" = 'delete' ] ||

+     [ "$1" = 'enter' ] ||

      [ "$1" = 'init' ] ||
      [ "$1" = 'run' ] ||
      [ "$1" = 'seed-gitignore' ] ||
      [ "$1" = 'init' ] ||
      [ "$1" = 'run' ] ||
      [ "$1" = 'seed-gitignore' ] ||


@@ -170,12 +180,20 @@ To continue, type \"Yes, do as I say\""
        cd "$old_dir"
        verbose "delete end"
 
        cd "$old_dir"
        verbose "delete end"
 

+elif [ "$VCSH_COMMAND" = 'enter' ]; then
+       verbose "enter begin"
+       use || return $?
+       $SHELL
+       leave
+       verbose "enter end"
+

 elif [ "$VCSH_COMMAND" = 'exit' ]; then
        verbose "exit begin"
 #      if [ -n "$ZSH_VERSION" ] && [ "$VCSH_NO_IGNORE_EOF" = '1' ]; then
 #              unset VCSH_NO_IGNORE_EOF
 #              setopt NO_IGNORE_EOF
 #      fi
 elif [ "$VCSH_COMMAND" = 'exit' ]; then
        verbose "exit begin"
 #      if [ -n "$ZSH_VERSION" ] && [ "$VCSH_NO_IGNORE_EOF" = '1' ]; then
 #              unset VCSH_NO_IGNORE_EOF
 #              setopt NO_IGNORE_EOF
 #      fi

+       [ -z "$VCSH_SOURCED" ] && echo "$SELF $VCSH_COMMAND: You need to source vcsh if you want to run in this mode" && return 10

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


@@ -251,6 +269,7 @@ elif [ "$VCSH_COMMAND" = 'use' ]; then
 #              zle -N vcsh_exit
 #              bindkey '^d' 'vcsh_exit'
 #      fi
 #              zle -N vcsh_exit
 #              bindkey '^d' 'vcsh_exit'
 #      fi

+       [ -z "$VCSH_SOURCED" ] && echo "$SELF $VCSH_COMMAND: You need to source vcsh if you want to run in this mode" && return 10

        use || return $?
 #      [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
        verbose "use end"
        use || return $?
 #      [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
        verbose "use end"