From 000d68f7c69d6bd4099e27aafae184bd3a032aeb Mon Sep 17 00:00:00 2001 From: Ionut Biru Date: Tue, 17 Aug 2010 15:51:12 +0300 Subject: copy packages into TEMPDIR TEMPDIR is used before packages are copied into it and made it fail because cannot find any. Signed-off-by: Ionut Biru Signed-off-by: Pierre Schmitz --- checkpkg | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/checkpkg b/checkpkg index 45572ca..0987a85 100755 --- a/checkpkg +++ b/checkpkg @@ -27,6 +27,7 @@ if [ "$arch" == 'any' ]; then CARCH='any' fi +STARTDIR=$(pwd) TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX) cd $TEMPDIR @@ -34,14 +35,14 @@ for _pkgname in ${pkgname[@]}; do pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} oldstylepkgfile=${_pkgname}-${pkgver}-${pkgrel}${PKGEXT} - if [ -f "$(pwd)/$pkgfile" ]; then - pkgfile=$(pwd)/$pkgfile + if [ -f "$STARTDIR/$pkgfile" ]; then + cp "$STARTDIR/$pkgfile" . elif [ -f "$PKGDEST/$pkgfile" ]; then - pkgfile=$PKGDEST/$pkgfile - elif [ -f "$(pwd)/$oldstylepkgfile" ]; then - pkgfile=$(pwd)/$oldstylepkgfile + cp "$PKGDEST/$pkgfile" . + elif [ -f "$STARTDIR/$oldstylepkgfile" ]; then + cp "$STARTDIR/$oldstylepkgfile" . elif [ -f "$PKGDEST/$oldstylepkgfile" ]; then - pkgfile=$PKGDEST/$oldstylepkgfile + cp "$PKGDEST/$oldstylepkgfile" . else echo "File \"$pkgfile\" doesn't exist" exit 1 -- cgit v1.2.3-24-g4f1b