The helper didn't display the key properly, and I couldn't figure out

[matthijs/upstream/backupninja.git] / handlers / dup.helper

diff --git a/handlers/dup.helper b/handlers/dup.helper
index f2413344f00fbb733a66808a00a377167730c330..e1d481ab197d7b1f03db4eda5d73616b4c8e62a9 100644 (file)
--- a/handlers/dup.helper
+++ b/handlers/dup.helper
@@ -185,7 +185,7 @@ do_dup_gpg_passphrase() {
 do_dup_gpg() {
    
    # symmetric or public key encryption ?
-   booleanBox "$dup_title - GnuPG" "Use public key encryption? Else, symmetric encryption will be used, and data signing will be impossible." "$dup_gpg_asymmetric_encryption"
+   booleanBox "$dup_title - GnuPG" "Use public key encryption? Otherwise, symmetric encryption will be used, and data signing will be impossible." "$dup_gpg_asymmetric_encryption"
    if [ $? = 0 ]; then
       dup_gpg_asymmetric_encryption=yes
    else
@@ -207,10 +207,10 @@ do_dup_gpg() {
         [ $? = 0 ] || return 1
    elif [ "$dup_gpg_sign" == "yes" ]; then
       if [ -z "$dup_gpg_signkey" ]; then
-        do_dup_gpg_passphrase "unlock the GnuPG 0x$dup_gpg_signkey key used to sign the backups"
+        do_dup_gpg_passphrase "unlock the GnuPG key used to sign the backups"
         [ $? = 0 ] || return 1
       else
-        do_dup_gpg_passphrase "unlock the GnuPG 0x$dup_gpg_encryptkey key used to sign the backups"
+        do_dup_gpg_passphrase "unlock the GnuPG key used to sign the backups"
         [ $? = 0 ] || return 1
       fi
    fi
@@ -354,13 +354,14 @@ EOF
 # vsinclude = <path>
 # ...
 # Any path specified in vsinclude is added to the include list for each vserver
-# listed in vsnames (or all if vsnames = all).
+# listed in vsnames (or all if vsnames = all, which is the default).
 #
 # For example, vsinclude = /home will backup the /home directory in every
 # vserver listed in vsnames. If you have 'vsnames = foo bar baz', this
 # vsinclude will add to the include list /vservers/foo/home, /vservers/bar/home
 # and /vservers/baz/home.
 # Vservers paths are derived from $VROOTDIR.
+# vsinclude supports globbing with '*'.
 
 EOF
 
@@ -507,7 +508,7 @@ dup_wizard() {
    # Global variables whose '*' shall not be expanded
    set -o noglob
    dup_default_includes="/var/spool/cron/crontabs /var/backups /etc /root /home /usr/local/*bin /var/lib/dpkg/status*"
-   dup_default_excludes="/home/*/.gnupg"
+   dup_default_excludes="/home/*/.gnupg /home/*/.gnupg /home/*/.local/share/Trash /home/*/.Trash /home/*/.thumbnails /home/*/.beagle /home/*/.aMule /home/*/gtk-gnutella-downloads"
    set +o noglob
 
    dup_main_menu