diff options
Diffstat (limited to 'src/lib/conf.sh')
| -rw-r--r-- | src/lib/conf.sh | 36 |
1 files changed, 1 insertions, 35 deletions
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 -} |