Merge branch 'main' into fix_test_accelerator_override

Author: Caspar van Leeuwen

create_tarball.sh

@@ -64,7 +64,7 @@ fi
 
 # consider both CPU-only and accelerator subdirectories (if an accelerator was configured)
 sw_subdirs=${cpu_arch_subdir}
-if [ -n ${accel_subdir} ]; then
+if [ -n "${accel_subdir}" ]; then
     sw_subdirs="${sw_subdirs} ${cpu_arch_subdir}/${accel_subdir}"
 fi
 for subdir in ${sw_subdirs}; do

load_eessi_extend_module.sh

@@ -115,8 +115,6 @@ if [ "${install_eessi_extend}" = true ] || [ "${rebuild_eessi_extend}" = true ];
         ok_msg="EESSI-extend/${EESSI_EXTEND_VERSION} installed, let's go!"
         fail_msg="Installing EESSI-extend/${EESSI_EXTEND_VERSION} failed, that's not good... (output: ${eessi_install_out})"
 
-        # while always adding --try-amend=keep... may do no harm, we could make
-        # an attempt to figure out if it is needed, e.g., when we are rebuilding
         eb_args=""
         if [ "${rebuild_eessi_extend}" = true ]; then
             eb_args+="--rebuild"