From 4ae03b417dec34a237a2a36410800e5ed5042d7d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 1 Jun 2013 13:16:55 -0600
Subject: conf.sh: fix potential bug with MAKEPKG_CONF

---
 src/lib/conf.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/conf.sh b/src/lib/conf.sh
index d0cded0..607f2b8 100644
--- a/src/lib/conf.sh
+++ b/src/lib/conf.sh
@@ -39,7 +39,7 @@ list_files() {
 			echo "$LIBREHOME/.$slug.conf"
 			;;
 		makepkg)
-			if [[ $MAKEPKG_CONF != /etc/$slug.conf && -r $MAKEPKG_CONF ]]; then
+			if [[ ${MAKEPKG_CONF:-} != /etc/$slug.conf && -r ${MAKEPKG_CONF:-} ]]; then
 				echo "$MAKEPKG_CONF"
 			else
 				echo /etc/$slug.conf
@@ -93,8 +93,6 @@ check_vars() {
 
 # makepkg configuration ########################################################
 
-[[ -n ${MAKEPKG_CONF:-} ]] || MAKEPKG_CONF=/etc/makepkg.conf
-
 load_conf_makepkg() {
 	load_files makepkg
 }
-- 
cgit v1.2.2