From 80401ac7e842df245c41fee340f32f7fcedd80f1 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 5 Jun 2013 20:00:57 -0600
Subject: Phase out `load_conf_*` and `check_conf_*` functions

Replace their usages with `load_files *` and `check_vars *`
---
 src/lib/conf.sh | 36 +-----------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/conf.sh b/src/lib/conf.sh
index 607f2b8..b9e8698 100644
--- a/src/lib/conf.sh
+++ b/src/lib/conf.sh
@@ -93,16 +93,12 @@ check_vars() {
 
 # makepkg configuration ########################################################
 
-load_conf_makepkg() {
-	load_files makepkg
-}
-
 # Usage: get_conf_makepkg <var_name> <default_value>
 get_conf_makepkg() (
 	set +euE
 	local setting=$1
 	local default=$2
-	load_conf_makepkg
+	load_files makepkg
 	printf '%s\n' "${!setting:-${default}}"
 )
 
@@ -118,33 +114,3 @@ set_conf_makepkg() {
 	done
 	return 1
 }
-
-# libretools configuration #####################################################
-
-check_conf_libretools() {
-	check_vars libretools \
-		PARABOLAHOST LIBREDESTDIR BLACKLIST WORKDIR REPOS ARCHES \
-		ABSLIBREGIT DIFFTOOL FULLBUILDCMD SIGEXT SIGID
-}
-
-load_conf_libretools() {
-	load_files libretools
-	check_conf_libretools
-}
-
-load_conf_libretools_chroot() {
-	load_files chroot
-	# Exclude CHROOTEXTRAPKG from the checks because an empty value is valid
-	if [[ -f /.arch-chroot ]]; then
-		# inside of a chroot, only CHROOTEXTRAPKG needs to be set, but
-		# as stated above, we don't check for it.
-		:
-	else
-		check_vars chroot CHROOTDIR CHROOT
-	fi
-}
-
-load_conf_libretools_librefetch() {
-	load_files librefetch
-	check_vars librefetch MIRROR DOWNLOADER
-}
-- 
cgit v1.2.2