From: Richard Hartmann Date: Thu, 24 Nov 2011 20:07:39 +0000 (+0100) Subject: Clean up Dieter's patches X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/ad4b54c8f747b631a9fc7b14a88509debb2799bd Clean up Dieter's patches --- diff --git a/vcsh b/vcsh index ae0fa68..16bfa53 100755 --- a/vcsh +++ b/vcsh @@ -35,16 +35,16 @@ verbose() { 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" } @@ -58,10 +58,10 @@ setup() { 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" - 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 @@ -122,10 +122,10 @@ for check_directory in "$VCSH_BASE" "$HOME/.gitignore.d" 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 - 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 @@ -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" ] && - error "$object exists." && + error "'$object' exists." && 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 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" @@ -223,12 +223,12 @@ elif [ "$VCSH_COMMAND" = 'seed-gitignore' ]; 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" || - 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" || - 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"