summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-06-01 13:16:55 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-06-05 19:53:57 -0600
commit4ae03b417dec34a237a2a36410800e5ed5042d7d (patch)
treec4935073f3ef42d9f5fcb8bb5f335703de52322d /src
parentcfa533eaedf9e78bfadde65da22dba53a1f165a4 (diff)
conf.sh: fix potential bug with MAKEPKG_CONF
Diffstat (limited to 'src')
-rw-r--r--src/lib/conf.sh4
1 files changed, 1 insertions, 3 deletions
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
}