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

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:

Clean up Dieter's patches
authorRichard Hartmann <richih.mailinglist@gmail.com>
Thu, 24 Nov 2011 20:07:39 +0000 (21:07 +0100)
committerRichard Hartmann <richih.mailinglist@gmail.com>
Thu, 24 Nov 2011 20:07:39 +0000 (21:07 +0100)
vcsh

diff --git a/vcsh b/vcsh
index ae0fa68afb02da9d7fddb271da9b7cbb2c96bc0f..16bfa53f738e3fd0a80b105c84bd2bc74d02e251 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -35,16 +35,16 @@ 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
 }
 
-error () {
-       echo "$SELF: error: $1" >&2
+fatal() {
+       echo "$SELF: fatal: $1" >&2
+       exit $2
 }
 
 }
 
-fatal () {
-       echo "$SELF: fatal error: $1" >&2
-       exit $2
+error() {
+       echo "$SELF: error: $1" >&2
 }
 
 }
 
-info () {
+info() {
        echo "$SELF: info: $1"
 }
 
        echo "$SELF: info: $1"
 }
 
@@ -58,10 +58,10 @@ setup() {
 
 init() {
        verbose "init() begin"
 
 init() {
        verbose "init() begin"
-       [ ! -e "$GIT_DIR" ] || fatal "$GIT_DIR exists" 10
+       [ ! -e "$GIT_DIR" ] || fatal "'$GIT_DIR' exists" 10
        export GIT_WORK_TREE="$HOME"
        mkdir -p "$GIT_WORK_TREE"
        export GIT_WORK_TREE="$HOME"
        mkdir -p "$GIT_WORK_TREE"
-       cd "$GIT_WORK_TREE" || fatal "could not enter $GIT_WORK_TREE" 11
+       cd "$GIT_WORK_TREE" || fatal "could not enter '$GIT_WORK_TREE'" 11
        cd "$GIT_WORK_TREE"
        git init
        setup
        cd "$GIT_WORK_TREE"
        git init
        setup
@@ -122,10 +122,10 @@ for check_directory in "$VCSH_BASE" "$HOME/.gitignore.d"
 do
        if [ ! -d "$check_directory" ]; then
                if [ -e "$check_directory" ]; then
 do
        if [ ! -d "$check_directory" ]; then
                if [ -e "$check_directory" ]; then
-                       fatal "$check_directory exists but is not a directory" 13
+                       fatal "'$check_directory' exists but is not a directory" 13
                else
                else
-                       info "attempting to create $check_directory"
-                       mkdir -p "$check_directory" || fatal "could not create $check_directory" 50
+                       info "attempting to create '$check_directory'"
+                       mkdir -p "$check_directory" || fatal "could not create '$check_directory'" 50
                fi
        fi
 done
                fi
        fi
 done
@@ -140,12 +140,12 @@ if [ "$VCSH_COMMAND" = 'clone' ]; then
        git fetch
        for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
                [ -e "$object" ] &&
        git fetch
        for object in $(git ls-tree -r origin/master | awk '{print $4}'); do
                [ -e "$object" ] &&
-                       error "$object exists." &&
+                       error "'$object' exists." &&
                        VCSH_CONFLICT=1;
        done
        [ "$VCSH_CONFLICT" = '1' ] &&
                fatal "will stop after fetching and not try to merge!
                        VCSH_CONFLICT=1;
        done
        [ "$VCSH_CONFLICT" = '1' ] &&
                fatal "will stop after fetching and not try to merge!
-  Once this situation has been resolved, run 'vcsh run <foo> git pull' to finish cloning.\n" 17
+  Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning.\n" 17
        git merge origin/master
        verbose "clone end"
 
        git merge origin/master
        verbose "clone end"
 
@@ -223,12 +223,12 @@ elif [ "$VCSH_COMMAND" = 'seed-gitignore' ]; then
                rm -f "$tempfile" &&
                exit
        if [ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ]; then
                rm -f "$tempfile" &&
                exit
        if [ -e "$HOME/.gitignore.d/$VCSH_REPO_NAME" ]; then
-               info "$HOME/.gitignore.d/$VCSH_REPO_NAME differs from new data, moving it to $HOME/.gitignore.d/$VCSH_REPO_NAME.bak"
+               info "'$HOME/.gitignore.d/$VCSH_REPO_NAME' differs from new data, moving it to '$HOME/.gitignore.d/$VCSH_REPO_NAME.bak'"
                mv -f "$HOME/.gitignore.d/$VCSH_REPO_NAME" "$HOME/.gitignore.d/$VCSH_REPO_NAME.bak" ||
                mv -f "$HOME/.gitignore.d/$VCSH_REPO_NAME" "$HOME/.gitignore.d/$VCSH_REPO_NAME.bak" ||
-                       fatal "could not move $HOME/.gitignore.d/$VCSH_REPO_NAME to $HOME/.gitignore.d/$VCSH_REPO_NAME.bak" 53
+                       fatal "could not move '$HOME/.gitignore.d/$VCSH_REPO_NAME' to '$HOME/.gitignore.d/$VCSH_REPO_NAME.bak'" 53
        fi
        mv -f "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" ||
        fi
        mv -f "$tempfile" "$HOME/.gitignore.d/$VCSH_REPO_NAME" ||
-               fatal "could not move $tempfile to $HOME/.gitignore.d/$VCSH_REPO_NAME" 53
+               fatal "could not move '$tempfile' to '$HOME/.gitignore.d/$VCSH_REPO_NAME'" 53
        cd "$old_dir"
        verbose "seed-gitignore end"
 
        cd "$old_dir"
        verbose "seed-gitignore end"