diff options
Diffstat (limited to 'src/abslibre-tools/librerelease')
| -rwxr-xr-x | src/abslibre-tools/librerelease | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index 51cf6de..e673081 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -164,21 +164,10 @@ main() { return 0 fi - # defer exiting on errors until we've tried to parse *all* - # config files, to have more complete error messages. - local err=false - { - load_files makepkg && - check_vars makepkg GPGKEY - } || err=true - { - load_files libretools && - # the HOOK* are settings are optional - check_vars libretools WORKDIR REPODEST ABSLIBREDEST # HOOKPRERELEASE HOOKPOSTRELEASE - } || err=true - if $err; then - return 6 - fi + declare -i ret=0 + load_conf makepkg.conf GPGKEY || ret=$? + load_conf libretools.conf WORKDIR REPODEST ABSLIBREDEST || ret=$? # and HOOK{PRE,POST}RELEASE, which are optional + [[ $ret = 0 ]] || exit $ret local re_url='^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?$' local re_authority='^(([^@]*)@)?([^][@:]*|\[[^]]*\])(:([0-9]*))?$' |