From 43171df80fc70a120193817058ee99efd54501de Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Wed, 17 May 2017 10:30:05 +0200 Subject: [PATCH] Pmodules/modbuild - don't search for a variants file while bootstrapping --- Pmodules/modbuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Pmodules/modbuild b/Pmodules/modbuild index f1541a6..ef25b48 100755 --- a/Pmodules/modbuild +++ b/Pmodules/modbuild @@ -315,15 +315,15 @@ done (( ok == 0 )) || std::die 3 "Oops: required BASH library '${libpbuild}' not found" -if [[ -n "${variants_file}" ]]; then - if [[ ! -r "${variants_file}" ]]; then - std::die 1 "${variants_file}: variants file does not exist or is not readable!" - fi -else - search_variants_file || std::die 2 "No usable variants file found!" -fi - if [[ ${bootstrap} == no ]]; then + if [[ -n "${variants_file}" ]]; then + if [[ ! -r "${variants_file}" ]]; then + std::die 1 "${variants_file}: variants file does not exist or is not readable!" + fi + else + search_variants_file || std::die 2 "No usable variants file found!" + fi + # initialize module environment source "${PMODULES_ROOT}/${PMODULES_CONFIG_DIR}/profile.bash" MODULECMD="${PMODULES_HOME}/bin/modulecmd"