summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphael Geissert <atomo64@gmail.com>2012-05-01 14:14:27 -0500
committerRaphael Geissert <atomo64@gmail.com>2012-05-01 14:14:27 -0500
commit3cb5f405310bac2c2f21fdfde8e9d22372b1e284 (patch)
tree16ef8779686f5e1cac848edc260d6daf7bbf3af1
parent8c00430921a4847dbf452b85cf113b714792da1e (diff)
Quote rsync patterns to avoid accidental expansion by the shell
-rwxr-xr-xbin/ftpsync6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/ftpsync b/bin/ftpsync
index 6794a79..2fc310d 100755
--- a/bin/ftpsync
+++ b/bin/ftpsync
@@ -283,7 +283,7 @@ RSYNC_BW=${RSYNC_BW:-0}
# Default rsync options for *every* rsync call
RSYNC_OPTIONS=${RSYNC_OPTIONS:-"-prltvHSB8192 --timeout 3600 --stats ${RSYNC_FILTER}"}
# Options we only use in the first pass, where we do not want packages/sources to fly in yet and don't want to delete files
-RSYNC_OPTIONS1=${RSYNC_OPTIONS1:-"--include 'installer-*/**/*' --include '*/' --exclude 'dists/**/*' --exclude ls-lR*"}
+RSYNC_OPTIONS1=${RSYNC_OPTIONS1:-"--include 'installer-*/**/*' --include '*/' --exclude 'dists/**/*' --exclude 'ls-lR*'"}
# Options for the second pass, where we do want everything, including deletion of old and now unused files
RSYNC_OPTIONS2=${RSYNC_OPTIONS2:-"--max-delete=40000 --delay-updates --delete --delete-after --delete-excluded"}
# Which rsync share to use on our upstream mirror?
@@ -334,10 +334,10 @@ SOURCE_EXCLUDE=${SOURCE_EXCLUDE:-""}
ARCH_EXCLUDE=${ARCH_EXCLUDE:-""}
# Exclude architectures defined in $ARCH_EXCLUDE
for ARCH in ${ARCH_EXCLUDE}; do
- EXCLUDE="${EXCLUDE} --exclude binary-${ARCH}/ --exclude installer-${ARCH}/ --exclude Contents-${ARCH}.gz --exclude Contents-${ARCH}.bz2 --exclude Contents-${ARCH}.diff/ --exclude arch-${ARCH}.files --exclude arch-${ARCH}.list.gz --exclude *_${ARCH}.deb --exclude *_${ARCH}.udeb --exclude *_${ARCH}.changes"
+ EXCLUDE="${EXCLUDE} --exclude binary-${ARCH}/ --exclude installer-${ARCH}/ --exclude Contents-${ARCH}.gz --exclude Contents-${ARCH}.bz2 --exclude Contents-${ARCH}.diff/ --exclude arch-${ARCH}.files --exclude arch-${ARCH}.list.gz --exclude \"*_${ARCH}.deb\" --exclude \"*_${ARCH}.udeb\" --exclude \"*_${ARCH}.changes\""
if [ "${ARCH}" = "source" ]; then
if [ -z ${SOURCE_EXCLUDE} ]; then
- SOURCE_EXCLUDE=" --exclude source/ --exclude *.tar.gz --exclude *.diff.gz --exclude *.tar.bz2 --exclude *.tar.xz -exclude *.diff.bz2 --exclude *.dsc "
+ SOURCE_EXCLUDE=" --exclude source/ --exclude '*.tar.gz' --exclude '*.diff.gz' --exclude '*.tar.bz2' --exclude '*.tar.xz' -exclude '*.diff.bz2' --exclude '*.dsc' "
fi
fi
done