diff --git a/templates/common/build_icon.sh b/templates/common/build_icon.sh index 6d9bd83faf907950bced90f73a41f9732501af32..68c7d1fbb50317a04545de77813fa2425def284f 100644 --- a/templates/common/build_icon.sh +++ b/templates/common/build_icon.sh @@ -16,6 +16,10 @@ cd ${WORKDIR} || exit . ${WORKDIR}/proj/platforms/common/spack_utils.sh load_spack "%spack.init%" "%spack.root%" "%spack.url%" "%spack.branch%" "%spack.compiler%" "%spack.disable_local_config%" "%spack.user_cache_path%" "%spack.user_config_path%" +if [ ! $(rpm -qa | grep bzip2) ]; then + spack install bzip2 + spack load --first bzip2 +fi SPACK_BUILD_ICON="%spack.build_cmd%" @@ -28,6 +32,7 @@ if [ ! -z "$SPACK_BUILD_ICON" ]; then else spack repo add ${WORKDIR}/proj/spack_repo fi + spack install $SPACK_BUILD_ICON spack load $SPACK_BUILD_ICON else @@ -42,11 +47,6 @@ if [ ! -f "${definitions_tar_file}" ]; then defs_url=https://opendata.dwd.de/weather/lib/grib/${definitions_tar_file} wget "${defs_url}" - if [ ! $(rpm -qa | grep bzip2) ]; then - spack install bzip2 - spack load --first bzip2 - fi - # Decompress definitions file tar -xf "${definitions_tar_file}" # Create a file containing the environment variable that needs to be set in order to use DWD's definitions: