From 72a9a9d4e459c50dddad50038ce030148d1bb595 Mon Sep 17 00:00:00 2001 From: gsell Date: Wed, 17 Apr 2019 14:37:34 +0200 Subject: [PATCH] Resolve "in modbuild arguments must be parsed before souring the configuration file" --- Pmodules/modbuild.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in index ad4d349..9b71194 100755 --- a/Pmodules/modbuild.in +++ b/Pmodules/modbuild.in @@ -365,10 +365,12 @@ build_modules() { #............................................................................. # main +parse_args "$@" + # source build configuration, # must be done before sourcing libpbuild! if [[ "${opt_bootstrap}" == 'yes' ]]; then - test -d ":${BUILDBLOCK_DIR}/../../${PMODULES_CONFIG_DIR}" && PATH+=":$_" + test -d "${BUILDBLOCK_DIR}/../../${PMODULES_CONFIG_DIR}" && PATH+=":$_" else test -d "${PMODULES_ROOT}/${PMODULES_CONFIG_DIR}" && PATH+=":$_" fi @@ -377,7 +379,6 @@ source "${build_config}" || \ source libpbuild.bash || \ std::die 3 "Oops: Cannot source library -- '$_'" -parse_args "$@" declare -r BUILD_SCRIPT declare -r BUILDBLOCK_DIR