From c0bb90f5818ae2c5d40f125f3c5982b92358c68c Mon Sep 17 00:00:00 2001 From: Nicolas Reynolds Date: Sun, 1 May 2011 22:47:56 -0300 Subject: Fixed way of finding packages on librestage. Also it just searchs for ARCHES instead of PKGBUILD architectures. Added 'any' to libretools.conf --- librestage | 12 +++++++++--- libretools.conf | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/librestage b/librestage index 6d7b45e..fa72098 100755 --- a/librestage +++ b/librestage @@ -64,11 +64,17 @@ source /etc/makepkg.conf PKGDEST=${PKGDEST:-.} SRCPKGDEST=${SRCPKGDEST:-.} +PKGEXT=".pkg.tar.?z" + # Copies the packages to the specified repos inside staging -for _arch in ${arch[@]}; do +for _arch in ${ARCHES[@]}; do for pkg in ${pkgname[@]}; do - pkgfile="$pkg-$pkgver-$pkgrel-$_arch$PKGEXT" - pkgpath="$PKGDEST/$pkgfile" + + pkgpath=$(find ${PKGDEST}/ -type f -name "${pkg}-${pkgver}-${pkgrel}-${_arch}${PKGEXT}") + + [[ -z ${pkgpath} ]] && continue; + + pkgfile=$(basename ${pkgpath}) if [ -e "${pkgpath}" ]; then msg "Found ${pkgfile}" diff --git a/libretools.conf b/libretools.conf index 2485be3..0999040 100644 --- a/libretools.conf +++ b/libretools.conf @@ -13,7 +13,7 @@ WORKDIR=/home/$USER/packages REPOS=('libre' 'libre-testing' 'core' 'community' 'extra' 'social' 'sugar') # The architectures -ARCHES=('i686' 'x86_64' 'mips64el') +ARCHES=('i686' 'x86_64' 'mips64el' 'any') ## The directory where the chroots are stored CHROOTDIR=/home/chroot -- cgit v1.2.3-54-g00ecf