buildrepo: fix previous commit

This commit is contained in:
Natanael Copa 2011-04-11 11:51:39 +00:00
parent 55af44f026
commit 1e3c5a742b

View File

@ -61,8 +61,8 @@ build() {
pkgs=$(abuild listpkg) pkgs=$(abuild listpkg)
if all_exist $pkgs; then if all_exist $pkgs; then
echo ">>> Copying " $pkgs echo ">>> Copying " $pkgs
cp -p -l $pkgs "$repodir/$repo/$CARCH"/ 2>/dev/null \ cp -p -l $pkgs "$repodir/$repo/$arch"/ 2>/dev/null \
|| cp -p $pkgs "$repodir/$repo/$CARCH"/ \ || cp -p $pkgs "$repodir/$repo/$arch"/ \
|| needbuild="$needbuild $i" || needbuild="$needbuild $i"
else else
needbuild="$needbuild $i" needbuild="$needbuild $i"
@ -81,7 +81,7 @@ build() {
if [ -n "$dopurge" ]; then if [ -n "$dopurge" ]; then
local tmp=$(mktemp /tmp/$program-XXXXXX) local tmp=$(mktemp /tmp/$program-XXXXXX)
local purgefiles local purgefiles
cd "$repodir/$repo/$CARCH" || return 1 cd "$repodir/$repo/$arch" || return 1
trap 'rm -f "$tmp"; exit 1' INT trap 'rm -f "$tmp"; exit 1' INT
( listpackages "$1") >$tmp ( listpackages "$1") >$tmp
purge=$(ls *.apk 2>/dev/null | grep -v -w -f $tmp) purge=$(ls *.apk 2>/dev/null | grep -v -w -f $tmp)