X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fdup.helper;h=13371f4668ba5a82dc5387702c687b22b47a0840;hb=608d395aa21fcb5b86d28bd3414a18badcfaf3bc;hp=7eca26195955e36088132a89973fb6c2620753ce;hpb=d56c0f0aeedc84560821bd3c57239476e12615ca;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/dup.helper b/handlers/dup.helper index 7eca261..13371f4 100644 --- a/handlers/dup.helper +++ b/handlers/dup.helper @@ -8,15 +8,16 @@ do_dup_host_includes() { REPLY= while [ -z "$REPLY" ]; do formBegin "$dup_title - host system: includes" - for ((i=0; i < ${#dup_default_includes[@]} ; i++)); do - formItem include ${dup_default_includes[$i]} + [ -z "$dup_includes" ] && dup_includes="$dup_default_includes" + for i in $dup_includes; do + formItem include "$i" done formItem include "" formItem include "" formItem include "" formDisplay [ $? = 0 ] || return 1 - dup_includes=($REPLY) + dup_includes="$REPLY" done set +o noglob } @@ -31,15 +32,16 @@ do_dup_vserver() { REPLY= while [ -z "$REPLY" ]; do formBegin "$dup_title - vservers: includes" - for ((i=0; i < ${#dup_default_includes[@]} ; i++)); do - formItem include ${dup_default_includes[$i]} + [ -z "$dup_vsincludes" ] && dup_vsincludes="$dup_default_includes" + for i in $dup_vsincludes; do + formItem include "$i" done formItem include "" formItem include "" formItem include "" formDisplay [ $? = 0 ] || return 1 - dup_vsincludes=($REPLY) + dup_vsincludes="$REPLY" done set +o noglob } @@ -47,15 +49,16 @@ do_dup_vserver() { do_dup_excludes() { set -o noglob formBegin "$dup_title: excludes" - for ((i=0; i < ${#dup_default_excludes[@]} ; i++)); do - formItem exclude ${dup_default_excludes[$i]} + [ -z "$dup_excludes" ] && dup_excludes="$dup_default_excludes" + for i in $dup_excludes; do + formItem exclude "$i" done formItem exclude "" formItem exclude "" formItem exclude "" formDisplay [ $? = 0 ] || return 1 - dup_excludes=($REPLY) + dup_excludes="$REPLY" set +o noglob } @@ -260,8 +263,8 @@ EOF if [ "$host_or_vservers" == host -o "$host_or_vservers" == both ]; then set -o noglob - for ((i=0; i < ${#dup_includes[@]} ; i++)); do - echo "include = ${dup_includes[$i]}" >> $next_filename + for i in $dup_includes; do + echo "include = $i" >> $next_filename done set +o noglob fi @@ -285,8 +288,8 @@ EOF if [ "$host_or_vservers" == vservers -o "$host_or_vservers" == both ]; then set -o noglob echo -e "vsnames = \"$selected_vservers\"\n" >> $next_filename - for ((i=0; i < ${#dup_vsincludes[@]} ; i++)); do - echo "vsinclude = ${dup_vsincludes[$i]}" >> $next_filename + for i in $dup_vsincludes; do + echo "vsinclude = $i" >> $next_filename done set +o noglob fi @@ -299,8 +302,8 @@ EOF # (supports globbing with '*') EOF set -o noglob - for ((i=0; i < ${#dup_excludes[@]} ; i++)); do - echo exclude = ${dup_excludes[$i]} >> $next_filename + for i in $dup_excludes; do + echo "exclude = $i" >> $next_filename done set +o noglob @@ -402,11 +405,9 @@ dup_wizard() { _con_done= _gpg_done= _adv_done= - declare -a dup_default_includes - declare -a dup_default_excludes - declare -a dup_includes - declare -a dup_excludes - declare -a dup_vsincludes + dup_includes= + dup_excludes= + dup_vsincludes= dup_incremental=yes dup_keep=60 dup_bandwidth= @@ -423,8 +424,8 @@ 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_includes="/var/spool/cron/crontabs /var/backups /etc /root /home /usr/local/*bin /var/lib/dpkg/status*" + dup_default_excludes="/home/*/.gnupg" set +o noglob dup_main_menu