projects
/
matthijs
/
upstream
/
backupninja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed the include=/exclude= improper dereference problem in the dup handler
[matthijs/upstream/backupninja.git]
/
handlers
/
dup
diff --git
a/handlers/dup
b/handlers/dup
index d32fcf26851890112f4a36f64e164e18e3850ca0..227ba8bcf11f1edc90b0dd71d696ef6ea46ee52d 100644
(file)
--- a/
handlers/dup
+++ b/
handlers/dup
@@
-34,8
+34,9
@@
destdir=${destdir%/}
[ "$include" != "" ] || fatal "No source includes specified"
### vservers stuff ###
[ "$include" != "" ] || fatal "No source includes specified"
### vservers stuff ###
-local usevserver=no
+
# If vservers are configured, check that the ones listed in $vsnames do exist.
# If vservers are configured, check that the ones listed in $vsnames do exist.
+local usevserver=no
if [ $vservers_are_available = yes ]; then
if [ "$vsnames" = all ]; then
vsnames="$found_vservers"
if [ $vservers_are_available = yes ]; then
if [ "$vsnames" = all ]; then
vsnames="$found_vservers"
@@
-113,14
+114,18
@@
execstr_clientpart="/"
### SOURCE ###
### SOURCE ###
+set -o noglob
+
# excludes
# excludes
-for i in "$exclude"; do
+for i in $exclude; do
+ i=`readlink -f $i`
str="${i//__star__/*}"
execstr="${execstr}--exclude '$str' "
done
# includes
str="${i//__star__/*}"
execstr="${execstr}--exclude '$str' "
done
# includes
-for i in "$include"; do
+for i in $include; do
+ i=`readlink -f $i`
str="${i//__star__/*}"
execstr="${execstr}--include '$str' "
done
str="${i//__star__/*}"
execstr="${execstr}--include '$str' "
done
@@
-128,13
+133,16
@@
done
# vsincludes
if [ $usevserver = yes ]; then
for vserver in $vsnames; do
# vsincludes
if [ $usevserver = yes ]; then
for vserver in $vsnames; do
- for vi in "$vsinclude"; do
- str="${vi//__star__/*}"
+ for vi in $vsinclude; do
+ i=`readlink -f $VROOTDIR/$vserver$vi`
+ str="${i//__star__/*}"
execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
done
done
fi
execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
done
done
fi
+set +o noglob
+
### EXECUTE ###
# exclude everything else, start with root
### EXECUTE ###
# exclude everything else, start with root