Merge branch '33-in-modbuild-arguments-must-be-parsed-before-souring-the-configuration-file' into 'master'

Resolve "in modbuild arguments must be parsed before souring the configuration file"

Closes #33

See merge request Pmodules/src!3
This commit is contained in:
2019-04-17 14:37:34 +02:00
+3 -2
View File
@@ -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