diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-05 19:08:11 +0100 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-05 21:24:26 +0000 |
| commit | 8022154108dde14f47722bd1a18a475ef2a3f95d (patch) | |
| tree | 6215baa0f5338e3cfc7693f8bbdfaeef844744ad /subr/pre_prereqs.subr | |
| parent | c1aae3835fe7d398b3e22f915fe6d7913b17ee44 (diff) | |
| download | midipix_build-8022154108dde14f47722bd1a18a475ef2a3f95d.tar.bz2 midipix_build-8022154108dde14f47722bd1a18a475ef2a3f95d.tar.xz | |
build.sh, {subr,vars}/*: general cleanup.
Diffstat (limited to 'subr/pre_prereqs.subr')
| -rw-r--r-- | subr/pre_prereqs.subr | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/subr/pre_prereqs.subr b/subr/pre_prereqs.subr index c5a965b3..f048365e 100644 --- a/subr/pre_prereqs.subr +++ b/subr/pre_prereqs.subr @@ -1,8 +1,9 @@ # -# . ./build.vars and set -o errexit -o noglob are assumed. +# set -o errexit -o noglob are assumed. # pre_prereqs() { + local __ _exit; for __ in ${CHECK_PATH_VARS}; do if [ -z "${___:=$(get_var_unsafe "${__}")}" ]; then log_msg failexit "Error: variable \`${__}' is empty or unset."; @@ -14,25 +15,23 @@ pre_prereqs() { if [ "${__#/}" != "${__}" ]; then if [ ! -e "${__}" ]; then log_msg fail "Error: missing prerequisite file \`${__}'."; - __exit=1; + _exit=1; fi; else if ! test_cmd "${__}"; then log_msg fail "Error: missing prerequisite command \`${__}'."; - __exit=1; + _exit=1; fi; fi; done; for __ in ${CHECK_PREREQ_PERL_MODULES}; do if ! perl -M"${__}" -e "" 2>/dev/null; then log_msg fail "Error: missing prerequisite Perl module \`${__}'."; - __exit=1; + _exit=1; fi; done; - if [ ${__exit:-0} = 1 ]; then + if [ ${_exit:-0} = 1 ]; then exit 1; - elif [ -n "${__exit}" ]; then - unset __exit; fi; }; |