X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Frdiff.helper;h=d28375e718ad0c822aff2a1cf6ca231c9195124e;hb=098952b69d5b39ea27bbe544cd85345422d03d80;hp=c21c5b584ea819adfccbef017186d0a3c0ce7fad;hpb=a99d05982d166c4bc455ef56773e93b8a558801f;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/rdiff.helper b/handlers/rdiff.helper
index c21c5b5..d28375e 100644
--- a/handlers/rdiff.helper
+++ b/handlers/rdiff.helper
@@ -289,17 +289,18 @@ 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
       set -o noglob
-      echo -e "vsnames = \"$selected_vservers\"\n" >> $next_filename
+      echo -e "vsnames = $selected_vservers\n" >> $next_filename
       for i in $rdiff_vsincludes; do
          echo "vsinclude = $i" >> $next_filename
       done
@@ -374,7 +375,7 @@ rdiff_wizard() {
    # Global variables whose '*' shall not be expanded
    set -o noglob
    rdiff_includes=(/var/spool/cron/crontabs /var/backups /etc /root /home /usr/local/*bin /var/lib/dpkg/status*)
-   rdiff_excludes=(/home/*/.gnupg)
+   rdiff_excludes=(/home/*/.gnupg /home/*/.local/share/Trash /home/*/.Trash /home/*/.thumbnails /home/*/.beagle /home/*/.aMule /home/*/gtk-gnutella-downloads)
    rdiff_vsincludes=
    set +o noglob