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 <ibiru@archlinux.org> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
This commit is contained in:
parent
fc6efdc38a
commit
000d68f7c6
13
checkpkg
13
checkpkg
|
@ -27,6 +27,7 @@ if [ "$arch" == 'any' ]; then
|
||||||
CARCH='any'
|
CARCH='any'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
STARTDIR=$(pwd)
|
||||||
TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX)
|
TEMPDIR=$(mktemp -d /tmp/checkpkg-script.XXXX)
|
||||||
cd $TEMPDIR
|
cd $TEMPDIR
|
||||||
|
|
||||||
|
@ -34,14 +35,14 @@ for _pkgname in ${pkgname[@]}; do
|
||||||
pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
|
pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
|
||||||
oldstylepkgfile=${_pkgname}-${pkgver}-${pkgrel}${PKGEXT}
|
oldstylepkgfile=${_pkgname}-${pkgver}-${pkgrel}${PKGEXT}
|
||||||
|
|
||||||
if [ -f "$(pwd)/$pkgfile" ]; then
|
if [ -f "$STARTDIR/$pkgfile" ]; then
|
||||||
pkgfile=$(pwd)/$pkgfile
|
cp "$STARTDIR/$pkgfile" .
|
||||||
elif [ -f "$PKGDEST/$pkgfile" ]; then
|
elif [ -f "$PKGDEST/$pkgfile" ]; then
|
||||||
pkgfile=$PKGDEST/$pkgfile
|
cp "$PKGDEST/$pkgfile" .
|
||||||
elif [ -f "$(pwd)/$oldstylepkgfile" ]; then
|
elif [ -f "$STARTDIR/$oldstylepkgfile" ]; then
|
||||||
pkgfile=$(pwd)/$oldstylepkgfile
|
cp "$STARTDIR/$oldstylepkgfile" .
|
||||||
elif [ -f "$PKGDEST/$oldstylepkgfile" ]; then
|
elif [ -f "$PKGDEST/$oldstylepkgfile" ]; then
|
||||||
pkgfile=$PKGDEST/$oldstylepkgfile
|
cp "$PKGDEST/$oldstylepkgfile" .
|
||||||
else
|
else
|
||||||
echo "File \"$pkgfile\" doesn't exist"
|
echo "File \"$pkgfile\" doesn't exist"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
Loading…
Reference in New Issue