Commit a2132bc8 authored by Andrea Scarpino's avatar Andrea Scarpino Committed by Pierre Schmitz
Browse files

read {SRC, PKG}DEST from user makepkg.conf 



Signed-off-by: default avatarPierre Schmitz <pierre@archlinux.de>
parent 964c0d16

makechrootpkg

+4 −2
Original line number Diff line number Diff line
@@ -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