diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-24 15:17:59 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2017-05-24 16:24:13 -0400 |
commit | 05128d533225b75f35f79a1f55b04556b7e9736b (patch) | |
tree | a2e8d723e76fd8e44c81ea0fbe1ad4dda597856d /src/dagpkg | |
parent | d712e575c0d5b1bf66443beec3e7ed75be636e2d (diff) |
Merge conf.sh:load_files and conf.sh:check_vars into load_conf
Diffstat (limited to 'src/dagpkg')
-rwxr-xr-x | src/dagpkg | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -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 |