From 590a58eb0dcbcdc9123ff017d443836328543cdc Mon Sep 17 00:00:00 2001 From: Yann Sagon Date: Tue, 12 Nov 2024 14:23:47 +0100 Subject: [PATCH 1/2] filter the installed EC to remove the statistics and built with version XX --- easybuild/scripts/findUpdatedEcs.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/easybuild/scripts/findUpdatedEcs.sh b/easybuild/scripts/findUpdatedEcs.sh index 66b7e34bd8..ac4717c0ba 100755 --- a/easybuild/scripts/findUpdatedEcs.sh +++ b/easybuild/scripts/findUpdatedEcs.sh @@ -28,6 +28,7 @@ function checkModule { return fi ec_installed="$ec_glob" +# ec_installed_filtered=<(sed '/^# Build statistics/,$d' $ec_installed | grep -v "# Built with") ec_filename=$(basename "$ec_installed") # Try with most likely location first for speed first_letter=${ec_filename:0:1} @@ -43,7 +44,7 @@ function checkModule { printError "=== Did not find new EC $ec_filename" elif [[ ! -e "$ec_new" ]]; then printError "=== Found multiple new ECs: $ec_new" - elif ! out=$(diff -u "$ec_installed" "$ec_new"); then + elif ! out=$(diff -B -u <(sed '/^# Build statistics/,$d' $ec_installed | grep -v "# Built with") "$ec_new"); then if ((short == 1)); then basename "$ec_installed" else From 6320a518b1de16c58f274a59269a2ceba1ab9760 Mon Sep 17 00:00:00 2001 From: Yann Sagon Date: Tue, 12 Nov 2024 14:35:58 +0100 Subject: [PATCH 2/2] cleanup --- easybuild/scripts/findUpdatedEcs.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/easybuild/scripts/findUpdatedEcs.sh b/easybuild/scripts/findUpdatedEcs.sh index ac4717c0ba..01414e09a4 100755 --- a/easybuild/scripts/findUpdatedEcs.sh +++ b/easybuild/scripts/findUpdatedEcs.sh @@ -28,7 +28,6 @@ function checkModule { return fi ec_installed="$ec_glob" -# ec_installed_filtered=<(sed '/^# Build statistics/,$d' $ec_installed | grep -v "# Built with") ec_filename=$(basename "$ec_installed") # Try with most likely location first for speed first_letter=${ec_filename:0:1}