Fix problem with PKGDEST variable not being used correctly.

This commit is contained in:
Dan McGee 2007-02-03 05:21:55 +00:00
parent da27889687
commit b6483b3cb4

View File

@ -314,9 +314,8 @@ usage() {
ARGLIST=$@ ARGLIST=$@
#preserve environment variables #preserve environment variables
PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined
_PKGDEST=${PKGDEST} _PKGDEST=${PKGDEST}
_SRCDEST=$SRCDEST _SRCDEST=${SRCDEST}
#Source makepkg.conf; fail if it is not found #Source makepkg.conf; fail if it is not found
if [ -f /etc/makepkg.conf ]; then if [ -f /etc/makepkg.conf ]; then
@ -333,7 +332,9 @@ fi
# override settings with an environment variable for batch processing # override settings with an environment variable for batch processing
PKGDEST=${_PKGDEST:-$PKGDEST} PKGDEST=${_PKGDEST:-$PKGDEST}
PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined
SRCDEST=${_SRCDEST:-$SRCDEST} SRCDEST=${_SRCDEST:-$SRCDEST}
SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined
while [ "$#" -ne "0" ]; do while [ "$#" -ne "0" ]; do
case $1 in case $1 in