X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/bcf33dd42f50079d4c2c19c64d2403435188cc3d..b87c7a220364f02b69b7d92bf8cd8070926a6058:/vcsh?ds=inline diff --git a/vcsh b/vcsh index 496a43f..0cd9340 100755 --- a/vcsh +++ b/vcsh @@ -1,7 +1,7 @@ #!/bin/sh # This program is licensed under the GNU GPL version 2 or later. -# (c) Richard "RichiH" Hartmann , 2011-2012 +# (c) Richard "RichiH" Hartmann , 2011-2013 # For details, see LICENSE. To submit patches, you have to agree to # license your code under the GNU GPL version 2 or later. @@ -9,6 +9,7 @@ # explain the choice of GPLv2+ over GPLv3+. # The author prefers GPLv3+ over GPLv2+ but feels it's better to maintain # full compability with git. In case git ever changes its licensing terms, +# which is admittedly extremely unlikely to the point of being impossible, # this software will most likely follow suit. SELF=$(basename $0) @@ -25,12 +26,12 @@ while getopts "c:dv" flag; do if [ "$1" = '-d' ] || [ "$1" = '--debug' ]; then set -vx VCSH_DEBUG=1 - shift 1 elif [ "$1" = '-v' ];then VCSH_VERBOSE=1 elif [ "$1" = '-c' ];then VCSH_OPTION_CONFIG=$OPTARG fi + shift 1 done source_all() { @@ -138,7 +139,7 @@ clone() { delete() { cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11 use - info "This operation WILL DETROY DATA!" + info "This operation WILL DESTROY DATA!" files=$(git ls-files) echo "These files will be deleted: @@ -151,7 +152,7 @@ To continue, type 'Yes, do as I say'" for file in $files; do rm -f $file || info "could not delete '$file', continuing with deletion" done - rm -r "$GIT_DIR" || error "could not delete '$GIT_DIR'" + rm -rf "$GIT_DIR" || error "could not delete '$GIT_DIR'" } enter() {