From e656ec7052d90a2501f31ed350137e81ea3136ae Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 1 Jul 2010 16:51:43 +0200 Subject: Check if ~/.makepkg.conf exists Fixes FS#20041 --- makechrootpkg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/makechrootpkg b/makechrootpkg index 79dc517..4ff69b0 100755 --- a/makechrootpkg +++ b/makechrootpkg @@ -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" -- cgit v1.2.3-70-g09d2