]> git.madduck.net Git - code/vcsh.git/blobdiff - vcsh

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

projects / code / vcsh.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
`vcsh init` without repo name prints help, now
[code/vcsh.git] / vcsh
diff --git a/vcsh b/vcsh
index 5acd515dc422ab8b0dc0ef2d42611dc7db2f67c2..38c1e0d7da477981e8ad8e1380e1b59f8cd0d742 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
 #!/bin/sh
 
-#set -x
+[ "$VCSH_DEBUG" = '1' ] && set -x
 
 SELF=$(basename $0)
 
 
 SELF=$(basename $0)
 
-[ -z $XDG_CONFIG_HOME ] && XDG_CONFIG_HOME="$HOME/.config"
+[ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
 for check_directory in $XDG_CONFIG_HOME $XDG_CONFIG_HOME/vcsh $XDG_CONFIG_HOME/vcsh/repo.d
 do
 for check_directory in $XDG_CONFIG_HOME $XDG_CONFIG_HOME/vcsh $XDG_CONFIG_HOME/vcsh/repo.d
 do
-       if [ ! -d $check_directory ]; then
-               if [ -e $check_directory ]; then
+       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: error: $check_directory exists but is not a directory" >&2
                        exit 2
                else
@@ -19,25 +19,34 @@ done
 
 VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 
 
 VCSH_BASE="$XDG_CONFIG_HOME/vcsh/repo.d"
 
+debug() {
+       [ "$VCSH_DEBUG" = '1' ] && echo "$SELF: debug: $1"
+}
+
+verbose() {
+       if [ "$VCSH_DEBUG" = '1' ] || [ "$VCSH_VERBOSE" = '1' ]; then echo "$SELF: verbose: $1"; fi
+}
+
+#   use <repo>     Use this repository
 help() {
        echo "usage: $SELF <args>
 
 help() {
        echo "usage: $SELF <args>
 
-   help           Display this help
+   help              Display this help
 
 
-   list           List all repos
+   list              List all repos
 
 
-   use <repo>     Use this repository
-   run <repo>
-       <command>  Use this repository
+   run <repo> \\
+       <command>     Use this repository
 
 
-   init           Initialize a new repository
-   clone <remote>
-         [<repo>] Clone from an existing repository
+   init <repo>       Initialize a new repository
+   clone <remote> \\
+         [<repo>]    Clone from an existing repository
 
 
-   exit           Exit vcsh mode" >&2
+   exit              Exit vcsh mode" >&2
 }
 
 use() {
 }
 
 use() {
+       verbose "use() begin"
        REPO_NAME="$1"
        GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
 
        REPO_NAME="$1"
        GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
 
@@ -49,10 +58,12 @@ use() {
        export GIT_DIR
        export GIT_WORK_TREE="$(git config --get core.worktree)"
        export VCSH_DIRECTORY="$REPO_NAME"
        export GIT_DIR
        export GIT_WORK_TREE="$(git config --get core.worktree)"
        export VCSH_DIRECTORY="$REPO_NAME"
+       verbose "use() end"
 }
 
 init() {
 }
 
 init() {
-       [[ -e $GIT_DIR ]] &&
+       verbose "init() begin"
+       [ -e "$GIT_DIR" ] &&
                echo "$SELF: fatal: $GIT_DIR exists" &&
                return 21
        export GIT_WORK_TREE="$HOME"
                echo "$SELF: fatal: $GIT_DIR exists" &&
                return 21
        export GIT_WORK_TREE="$HOME"
@@ -63,6 +74,7 @@ init() {
        cd $GIT_WORK_TREE
        git init
        git config core.worktree $GIT_WORK_TREE
        cd $GIT_WORK_TREE
        git init
        git config core.worktree $GIT_WORK_TREE
+       verbose "init() end"
 }
 
 leave() {
 }
 
 leave() {
@@ -71,40 +83,52 @@ leave() {
        unset VCSH_DIRECTORY
 }
 
        unset VCSH_DIRECTORY
 }
 
-if [ "$1" = 'help' ] || [ $# -eq 0 ]; then
+if [ "$1" = 'help' ] || [ "$#" -eq 0 ]; then
        help
        [ "$1" = 'help' ]
        help
        [ "$1" = 'help' ]
-       return $?
+       exit $?
 
 elif [ "$1" = 'list' ]; then
 
 elif [ "$1" = 'list' ]; then
+       verbose "list begin"
        for i in $VCSH_BASE/*.git; do
                echo $(basename $i .git)
        done
        for i in $VCSH_BASE/*.git; do
                echo $(basename $i .git)
        done
-       return 0
+       verbose "list end"
+       exit 0
 
 elif [ "$1" = 'run' ]; then
 
 elif [ "$1" = 'run' ]; then
+       verbose "run begin"
        use $2
        shift 2
        "$@"
        leave
        use $2
        shift 2
        "$@"
        leave
-       return 0
-
-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;}
-               zle -N vcsh_exit
-               bindkey '^d' 'vcsh_exit'
-       fi
-       use $2
-       buildPS1
-       return 0
+       verbose "run end"
+       exit 0
+
+#elif [ "$1" = 'use' ]; then
+#      verbose "use begin"
+#      if [ -n "$ZSH_VERSION" ]; then
+#              if [ -o NO_IGNORE_EOF ]; then
+#                      export VCSH_NO_IGNORE_EOF=1
+#                      setopt IGNORE_EOF
+#              fi
+#              vcsh_exit() {
+#                      vcsh exit;
+#                      zle reset-prompt;
+#              }
+#              zle -N vcsh_exit
+#              bindkey '^d' 'vcsh_exit'
+#      fi
+#      use $2
+#      [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
+#      verbose "use end"
+#      exit 0
 
 elif [ "$1" = 'clone' ]; then
 
 elif [ "$1" = 'clone' ]; then
+       verbose "clone begin"
        GIT_REMOTE="$2"
        REPO_NAME="$3"
        GIT_REMOTE="$2"
        REPO_NAME="$3"
-       [[ -z $REPO_NAME ]] && REPO_NAME=$(basename $GIT_REMOTE .git)
+       [ -z "$REPO_NAME" ] && REPO_NAME=$(basename $GIT_REMOTE .git)
        export REPO_NAME
        export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
        init
        export REPO_NAME
        export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
        init
@@ -113,35 +137,42 @@ elif [ "$1" = 'clone' ]; then
        git config branch.master.remote origin
        git config branch.master.merge  refs/heads/master
        git fetch
        git config branch.master.remote origin
        git config branch.master.merge  refs/heads/master
        git fetch
-       for i in $(git ls-tree -r origin/master | awk '{print $4}'); do
-       [[ -e $i ]] &&
-               echo "$SELF: error: $i exists." &&
-               CONFLICT=1;
+       for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
+               [ -e "$object" ] &&
+                       echo "$SELF: error: $object exists." &&
+                       VCSH_CONFLICT=1;
        done
        done
-       [[ -n $CONFLICT ]] &&
+       [ "$VCSH_CONFLICT" = '1' ] &&
                echo "$SELF: fatal: will stop after fetching and not try to merge!\n" &&
                exit 3
        git merge origin/master
                echo "$SELF: fatal: will stop after fetching and not try to merge!\n" &&
                exit 3
        git merge origin/master
-       vcsh use $REPO_NAME
+#      vcsh use $REPO_NAME
+       verbose "clone end"
 
 elif [ "$1" = 'init' ]; then
 
 elif [ "$1" = 'init' ]; then
+       verbose "init begin"
+       [ -z $2 ] && help; 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
+#      vcsh use $REPO_NAME
+       verbose "init end"
 
 elif [ "$1" = 'exit' ]; then
 
 elif [ "$1" = 'exit' ]; then
-       if [[ $VCSH_NO_IGNORE_EOF -gt 0 ]]; then
+       verbose "exit begin"
+       if [ -n "$ZSH_VERSION" ] && [ "$VCSH_NO_IGNORE_EOF" = '1' ]; then
                unset VCSH_NO_IGNORE_EOF
                setopt NO_IGNORE_EOF
        fi
        leave
                unset VCSH_NO_IGNORE_EOF
                setopt NO_IGNORE_EOF
        fi
        leave
-       buildPS1
-       return 0
+       [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
+       verbose "exit end"
+       exit 0
 
 else
 
 else
+       verbose "defaulting to calling help()"
        help
        help
-       return 3
+       exit 3
 
 fi
 
 
 fi
 
version controlled RC files

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.