From c330b1453f7c0d7c2261324083ba9e3a98ea130d Mon Sep 17 00:00:00 2001 From: François Charette Date: Fri, 12 Jun 2009 08:04:38 -0700 Subject: fixes for ftpdir-cleanup * don't add files with arch=any to EXTRAFILES * replace && by -a within [ ] Signed-off-by: Aaron Griffin --- misc-scripts/ftpdir-cleanup | 4 ++-- 1 file 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 -- cgit v1.2.3-24-g4f1b