summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastian Blank <bastian.blank@credativ.de>2016-02-10 09:12:45 +0100
committerBastian Blank <bastian.blank@credativ.de>2016-02-10 09:12:45 +0100
commit0cbcb91ccf96631ff01c605c11e2b14c75dc446c (patch)
treec84eec511425941dee787299c94600f7ee70c5ef
parentffb77d0f04ae06ffbc477a147a4239c9aeebbdc4 (diff)
Correctly generate architecture list in case for arch include
-rwxr-xr-xbin/ftpsync21
1 files changed, 15 insertions, 6 deletions
diff --git a/bin/ftpsync b/bin/ftpsync
index fcd11b3..18e8e01 100755
--- a/bin/ftpsync
+++ b/bin/ftpsync
@@ -202,13 +202,22 @@ tracefile() {
if [[ full = ${EXTENDEDTRACE} ]]; then
GLOBALARCHLIST="source amd64 arm64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el s390 s390x sparc"
- AEXCLUDE="^${ARCH_EXCLUDE// /\$|^}$"
ARCHLIST=""
- for ARCH in ${GLOBALARCHLIST}; do
- if ! [[ ${ARCH} =~ ${AEXCLUDE} ]]; then
- ARCHLIST="${ARCHLIST} ${ARCH}"
- fi
- done
+ if [[ ${ARCH_INCLUDE} ]]; then
+ AINCLUDE="^${ARCH_INCLUDE// /\$|^}$"
+ for ARCH in ${GLOBALARCHLIST}; do
+ if [[ ${ARCH} =~ ${AINCLUDE} ]]; then
+ ARCHLIST="${ARCHLIST} ${ARCH}"
+ fi
+ done
+ else
+ AEXCLUDE="^${ARCH_EXCLUDE// /\$|^}$"
+ for ARCH in ${GLOBALARCHLIST}; do
+ if ! [[ ${ARCH} =~ ${AEXCLUDE} ]]; then
+ ARCHLIST="${ARCHLIST} ${ARCH}"
+ fi
+ done
+ fi
out="GUESSED:{${ARCHLIST}}"
echo "Architectures: ${out}"
echo "Upstream-mirror: ${RSYNC_HOST}"