summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Charette <francois@archlinux.org>2009-06-12 17:04:38 +0200
committerAaron Griffin <aaronmgriffin@gmail.com>2009-06-12 17:04:38 +0200
commitc330b1453f7c0d7c2261324083ba9e3a98ea130d (patch)
treefe4c82e92fe9d5ad124d7de9eab2c7a0be2d2e3f
parent9217d0074e4962761320cc7423fc139b9d8ad382 (diff)
downloaddbscripts-c330b1453f7c0d7c2261324083ba9e3a98ea130d.tar.gz
dbscripts-c330b1453f7c0d7c2261324083ba9e3a98ea130d.tar.xz
fixes for ftpdir-cleanup
* don't add files with arch=any to EXTRAFILES * replace && by -a within [ ] Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rwxr-xr-xmisc-scripts/ftpdir-cleanup4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc-scripts/ftpdir-cleanup b/misc-scripts/ftpdir-cleanup
index a87ed8f..fbf2925 100755
--- a/misc-scripts/ftpdir-cleanup
+++ b/misc-scripts/ftpdir-cleanup
@@ -69,7 +69,7 @@ for pkg in *; do
done
cd "$ftppath"
-for pkg in *$PKGEXT; do
+for pkg in *$arch$PKGEXT; do
pkgname="$(getpkgname $pkg)"
for p in ${TMPDIR}/${pkgname}-*; do
if [ -d "${p}" -a "$(getpkgname $(basename ${p}))" = "${pkgname}" ]; then
@@ -81,7 +81,7 @@ done
cd "$ftppath_base/any"
for pkg in *$PKGEXT; do
- if [ ! -h $ftppath_base/i686/$pkg && ! -h $ftppath_base/x86_64/$pkg ]; then
+ if [ ! -h $ftppath_base/i686/$pkg -a ! -h $ftppath_base/x86_64/$pkg ]; then
ARCHINDEPFILES="$ARCHINDEPFILES $pkg"
fi
done