Merge branch 'master' of github.com:RichiH/vcsh

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 194bb2151c2a94a55098d74edc16176ad07ed2fb..4e618dfbff60878636a10a629225d8e411541c2a 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # This program is licensed under the GNU GPL version 2 or later.
 #!/bin/sh
 
 # This program is licensed under the GNU GPL version 2 or later.

-# (c) Richard "RichiH" Hartmann <richih.mailinglist@gmail.com>, 2011-2012
+# (c) Richard "RichiH" Hartmann <richih.mailinglist@gmail.com>, 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.
 
 # 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,
 # 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)
 # this software will most likely follow suit.
 
 SELF=$(basename $0)


@@ -138,7 +139,7 @@ clone() {
 delete() {
        cd "$VCSH_BASE" || fatal "could not enter '$VCSH_BASE'" 11
        use
 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:
 
        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
        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() {
 }
 
 enter() {