Check if ~/.makepkg.conf exists

Fixes FS#20041
This commit is contained in:
Pierre Schmitz 2010-07-01 16:51:43 +02:00
parent dcc7b6728d
commit e656ec7052
1 changed files with 4 additions and 2 deletions

View File

@ -133,9 +133,11 @@ if [ "$REPACK" != "1" ]; then
fi
# Get SRC/PKGDEST from makepkg.conf
SRCDEST=$(grep '^SRCDEST=' ~/.makepkg.conf | cut -d= -f2)
if [ -f ~/.makepkg.conf ]; then
SRCDEST=$(grep '^SRCDEST=' ~/.makepkg.conf | cut -d= -f2)
PKGDEST=$(grep '^PKGDEST=' ~/.makepkg.conf | cut -d= -f2)
fi
[ -z ${SRCDEST} ] && SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= -f2)
PKGDEST=$(grep '^PKGDEST=' ~/.makepkg.conf | cut -d= -f2)
[ -z ${PKGDEST} ] && PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= -f2)
[ -d "$copydir/pkgdest" ] || mkdir "$copydir/pkgdest"