And another one for misc-scripts/ftpdir-cleanup
F
>From b097a2695617a08da7274b5f1d8560d70a915848 Mon Sep 17 00:00:00 2001
From: Francois Charette <[email protected]>
Date: Thu, 14 May 2009 23:00:42 +0200
Subject: [PATCH] fixes for ftpdir-cleanup: use bsdtar xf instead of tar xzf;
don't add files with arch=any to EXTRAFILES; and replace && by -a within [ ]
---
misc-scripts/ftpdir-cleanup | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/misc-scripts/ftpdir-cleanup b/misc-scripts/ftpdir-cleanup
index ed90437..73355ea 100755
--- a/misc-scripts/ftpdir-cleanup
+++ b/misc-scripts/ftpdir-cleanup
@@ -49,7 +49,7 @@ EXTRAFILES=""
TMPDIR=$(mktemp -d /tmp/cleanup.XXXXXX) || exit 1
cd "${TMPDIR}"
-/bin/tar xzf "$ftppath/$reponame.db.tar.$DB_COMPRESSION"
+/usr/bin/bsdtar xf "$ftppath/$reponame.db.tar.$DB_COMPRESSION" || exit 1
for pkg in *; do
filename=$(grep -A1 '^%FILENAME%$' "${pkg}/desc" | tail -n1)
@@ -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
--
1.6.3
