From dc3ef505744355a22cbfed3f205107a8081adb4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Sun, 5 Feb 2017 23:31:21 +0100 Subject: build.sh, {subr,vars}/*: general cleanup. --- build.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 4bf432b3..a6cfeffa 100755 --- a/build.sh +++ b/build.sh @@ -62,14 +62,14 @@ for BUILD_TARGET_LC in $(subst_tgts invariants ${BUILD_TARGETS_META:-world}); do else unset BUILD_SCRIPT_RC; fi; - (set -o errexit -o noglob; pkg_000000; + (set -o errexit -o noglob; if [ -n "${BUILD_PACKAGES_RESTART}" ]\ || ! is_build_script_done "${PKG_NAME}" finish; then - build_fileop cd "${WORKDIR}"; + PKG_BUILD_STEPS="$(get_var_unsafe PKG_$(echo ${PKG_NAME} | tr a-z A-Z)_BUILD_STEPS)"; set -- ${PKG_BUILD_STEPS:-${BUILD_STEPS}}; while [ ${#} -gt 0 ]; do _pkg_step_cmds=""; - case ${1#*:} in + case "${1#*:}" in abstract) _pkg_step_cmds="pkg_${PKG_NAME}_${1%:*}"; ;; always) _pkg_step_cmds="pkg_${1%:*}"; ;; main) if [ -n "${BUILD_PACKAGES_RESTART}" ]; then @@ -86,10 +86,10 @@ for BUILD_TARGET_LC in $(subst_tgts invariants ${BUILD_TARGETS_META:-world}); do fi; ;; esac; for __ in ${_pkg_step_cmds}; do - if test_cmd ${__}; then - ${__}; - set_build_script_done "${PKG_NAME}" "${1%:*}" ${2:+-${2%:*}}; - break; + if test_cmd "${__}"; then + "${__}"; + set_build_script_done "${PKG_NAME}" "${1%:*}" \ + ${2:+-${2%:*}}; break; fi; done; shift; done; -- cgit v1.2.3