From cbd6de07698419c2ad1fdb72c81a0cc4c33292f0 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 28 Jun 2022 16:18:05 +0200 Subject: [PATCH 1/2] modbuild: use bash from Pmodules module --- Pmodules/modbuild.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in index adcb5be..b489513 100755 --- a/Pmodules/modbuild.in +++ b/Pmodules/modbuild.in @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!@BASH@ # # The following build specific variables are set and used in libpbuild.bash: # ARGS From efff990f0aa9d543190865f8bd273cc4979c8530 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Tue, 28 Jun 2022 16:21:21 +0200 Subject: [PATCH 2/2] modbuild: bash 5 check removed --- Pmodules/modbuild.in | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in index b489513..a9896ce 100755 --- a/Pmodules/modbuild.in +++ b/Pmodules/modbuild.in @@ -34,14 +34,6 @@ source libstd.bash || { echo "Oops: cannot source library -- '$_'" 1>&2; exit 3; } -if (( ${BASH_VERSINFO[0]} < 5 )); then - std::info "bash >= 5 is required! You are running bash ${BASH_VERSION} ..." - std::info "Make sure that bash >= 5 is in your PATH." - std::info "bash >= 5 is available as Pmodule:" - std::info " module load System:bash" - std::die 3 "" -fi - std::def_cmds "${path}" \ 'awk' 'base64' 'find' 'getopt' 'logger' 'mktemp' \ 'rm' 'sort' 'find' 'yq'