On Monday 28 June 2010 08:16:06 Pierre Schmitz wrote: > Could you resent this patch? It seems broken. In doubt just send as an > attachement and not inline.
-- Andrea Scarpino - andreascarpino.it KDE Maintainer in Arch Linux
From 0633db1368d0e48eb79b4bad8477390ee6943468 Mon Sep 17 00:00:00 2001 From: Andrea Scarpino <[email protected]> Date: Mon, 28 Jun 2010 08:49:56 +0200 Subject: [PATCH] read {SRC, PKG}DEST from user makepkg.conf --- makechrootpkg | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/makechrootpkg b/makechrootpkg index 01cb3a9..b54ad81 100755 --- a/makechrootpkg +++ b/makechrootpkg @@ -134,8 +134,10 @@ if [ "$REPACK" != "1" ]; then fi # Get SRC/PKGDEST from makepkg.conf -SRCDEST=$(grep '^SRCDEST=' /etc/makepkg.conf | cut -d= -f2) -PKGDEST=$(grep '^PKGDEST=' /etc/makepkg.conf | cut -d= -f2) +SRCDEST=$(grep '^SRCDEST=' ~/.makepkg.conf | cut -d= -f2) +[ -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" if ! grep 'PKGDEST=/pkgdest' "$copydir/etc/makepkg.conf" >/dev/null 2>&1; then -- 1.7.1
