Merge conf.sh:load_files and conf.sh:check_vars into load_conf

1 files changed, 4 insertions, 7 deletions

diff --git a/src/dagpkg b/src/dagpkg
index d6f7cca..f205390 100755
--- a/src/dagpkg
+++ b/src/dagpkg
@@ -137,13 +137,10 @@ visit_pkgbuild() {
 
 main() {
 	# Source variables from libretools
-	load_files libretools
-	check_vars libretools FULLBUILDCMD || exit 1
-	#check_vars libretools HOOKPREBUILD HOOKLOCALRELEASE || exit 1 # optional
-
-	# Source variables from makepkg
-	load_files makepkg
-	check_vars makepkg CARCH || exit 1
+	declare -i ret=0
+	load_conf libretools.conf FULLBUILDCMD || ret=$ # and HOOK{PRE,POST}BUILD, which are optional
+	load_conf makepkg.conf CARCH || ret=$?
+	[[ $ret = 0 ]] || exit $ret
 
 	setup_traps trap_exit