From 35c38f5731cbe18884550adbc0b461decd1fb72b Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 13 Jun 2024 17:03:34 +0200 Subject: [PATCH] build-system: use string for versions to build --- Pmodules/modbuild.in | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in index 2372d5b..7ce8587 100755 --- a/Pmodules/modbuild.in +++ b/Pmodules/modbuild.in @@ -169,7 +169,7 @@ DOCUMENTATION: declare -r ARGS="$@" # versions to be build, '.*' or none means all -declare -a versions=() +declare versions_to_build='' declare opt_build_target='all' declare opt_dry_run='no' declare opt_enable_cleanup_build='yes' @@ -208,7 +208,6 @@ parse_args() { # the build-script MUST be passed as first argument. # (( $# == 0 )) && usage - while (( $# > 0 )); do case $1 in -j ) @@ -356,11 +355,10 @@ parse_args() { BUILDBLOCK_DIR=$(dirname "${BUILD_SCRIPT}") elif [[ "${arg}" == */* ]]; then module_name="${arg%/*}" - versions+=( {arg#*/} ) + versions_to_build+=" ${arg#*/}" else - versions+=( "$1" ) + versions_to_build+=" $1" fi - ;; esac shift @@ -371,8 +369,8 @@ parse_args() { "Build script argument missing?" # if no version is specified on the cmd-line, build all versions - (( ${#versions[@]} > 0)) || versions+=( '.*' ) - + #(( ${#versions_to_build[@]} > 0)) || versions_to_build+=( '.*' ) + [[ -z ${versions_to_build} ]] && versions_to_build='.*' # set system if not set on the cmd-line opt_system="${opt_system:-$(std::get_os_release)}" @@ -1568,7 +1566,7 @@ if [[ -z ${module_name} ]]; then module_name=${fname[${#fname[@]}-2]} fi -for version in "${versions[@]}"; do +for version in ${versions_to_build}; do build_modules "${module_name}" "${version}" "${opt_with_modules[@]}" done