[arch-dev-public] [PATCH] copy packages into TEMPDIR
Ionut Biru
ibiru at archlinux.org
Tue Aug 17 08:51:12 EDT 2010
TEMPDIR is used before packages are copied into it and made it fail
because cannot find any.
Signed-off-by: Ionut Biru <ibiru at archlinux.org>
---
checkpkg | 13 +++++++------
1 files 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
--
1.7.2.1
More information about the arch-dev-public
mailing list