projects
/
matthijs
/
upstream
/
backupninja-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r253@um: micah | 2005-12-27 17:34:08 -0500
[matthijs/upstream/backupninja-vserver.git]
/
handlers
/
dup.helper
diff --git
a/handlers/dup.helper
b/handlers/dup.helper
index 7eca26195955e36088132a89973fb6c2620753ce..7297fb1b8b15b3bcd88bbf8041349a25dc73b7fd 100644
(file)
--- 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"
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
done
formItem include ""
formItem include ""
formItem include ""
formDisplay
[ $? = 0 ] || return 1
- dup_includes=
($REPLY)
+ dup_includes=
"$REPLY"
done
set +o noglob
}
done
set +o noglob
}
@@
-31,15
+32,16
@@
do_dup_vserver() {
REPLY=
while [ -z "$REPLY" ]; do
formBegin "$dup_title - vservers: includes"
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
done
formItem include ""
formItem include ""
formItem include ""
formDisplay
[ $? = 0 ] || return 1
- dup_vsincludes=
($REPLY)
+ dup_vsincludes=
"$REPLY"
done
set +o noglob
}
done
set +o noglob
}
@@
-47,15
+49,16
@@
do_dup_vserver() {
do_dup_excludes() {
set -o noglob
formBegin "$dup_title: excludes"
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
done
formItem exclude ""
formItem exclude ""
formItem exclude ""
formDisplay
[ $? = 0 ] || return 1
- dup_excludes=
($REPLY)
+ dup_excludes=
"$REPLY"
set +o noglob
}
set +o noglob
}
@@
-96,7
+99,7
@@
do_dup_dest() {
set -o noglob
REPLY=
while [ -z "$REPLY" -o -z "$dup_destdir" -o -z "$dup_desthost" -o -z "$dup_destuser" ]; do
set -o noglob
REPLY=
while [ -z "$REPLY" -o -z "$dup_destdir" -o -z "$dup_desthost" -o -z "$dup_destuser" ]; do
- formBegin "$dup_title - destination:
la
st three items are compulsory"
+ formBegin "$dup_title - destination:
fir
st three items are compulsory"
formItem "desthost" "$dup_desthost"
formItem "destuser" "$dup_destuser"
formItem "destdir" "$dup_destdir"
formItem "desthost" "$dup_desthost"
formItem "destuser" "$dup_destuser"
formItem "destdir" "$dup_destdir"
@@
-260,8
+263,8
@@
EOF
if [ "$host_or_vservers" == host -o "$host_or_vservers" == both ]; then
set -o noglob
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
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
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
done
set +o noglob
fi
@@
-299,8
+302,8
@@
EOF
# (supports globbing with '*')
EOF
set -o noglob
# (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
done
set +o noglob
@@
-402,11
+405,9
@@
dup_wizard() {
_con_done=
_gpg_done=
_adv_done=
_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=
dup_incremental=yes
dup_keep=60
dup_bandwidth=
@@
-423,8
+424,8
@@
dup_wizard() {
# Global variables whose '*' shall not be expanded
set -o noglob
# 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
set +o noglob
dup_main_menu