From cde1dc32f63416b05e36c19267adb1494cbbaf1a Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 4 Aug 2023 14:04:23 +0200 Subject: [PATCH 1/2] Set version to 1.1.15 --- build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build b/build index bf8bec7..c70d6d8 100755 --- a/build +++ b/build @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -declare -rx VERSION='1.1.14' +declare -rx VERSION='1.1.15' declare -rx BASH5_VERSION='5.2.15' declare -rx TCL_VERSION='8.6.13' declare -rx TCLLIB_VERSION='1.21' From 1685043df52bd7742024fbf7d266be189603e339 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 4 Aug 2023 14:06:39 +0200 Subject: [PATCH 2/2] modbuild: bugfix: don't build module twice --- Pmodules/modbuild.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in index d5f7d6b..5983b26 100755 --- a/Pmodules/modbuild.in +++ b/Pmodules/modbuild.in @@ -351,12 +351,6 @@ parse_args() { legacy_config_files=( "${BUILDBLOCK_DIR}"/*/variants.${opt_system} ) legacy_config_files+=( "${BUILDBLOCK_DIR}"/*/variants."$(uname -s)" ) legacy_config_files+=( "${BUILDBLOCK_DIR}"/*/variants ) - local f - for f in "${BUILDBLOCK_DIR}"/*/"${BNAME_VARIANTS}"; do - [[ -e "${f}.${opt_system}" ]] \ - || [[ -e "${f}.$(uname -s)" ]] \ - || legacy_config_files+=( "$f" ) - done (( nullglob_set == 1 )) && shopt -u nullglob fi (( ${#legacy_config_files[@]} == 0 )) && opt_yaml='check'