From 3a87a92aa7a1a29b4f068dc38afe8c0efe40ed11 Mon Sep 17 00:00:00 2001
From: "Fabian.Jakub" <fabian@jakub.com>
Date: Thu, 23 Mar 2023 10:15:29 +0100
Subject: [PATCH] encapsulate SPACK_BUILD_ICON when using %icon.spack_cmd%
---
templates/common/build_icon.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/templates/common/build_icon.sh b/templates/common/build_icon.sh
index 571c0dd..12687f1 100644
--- a/templates/common/build_icon.sh
+++ b/templates/common/build_icon.sh
@@ -15,12 +15,14 @@ cd ${WORKDIR}
load_spack "%spack.init%" "%spack.root%" "%spack.url%" "%spack.branch%" "%spack.compiler%" "%spack.disable_local_config%" "%spack.user_cache_path%"
SPACK_BUILD_ICON="%icon.spack_cmd%"
-if [ ! -z $SPACK_BUILD_ICON ]; then
+if [ ! -z "$SPACK_BUILD_ICON" ]; then
echo "Installing ICON with spack!"
echo "cmd=$SPACK_BUILD_ICON"
spack repo add ${WORKDIR}/proj/spack_repo
spack install $SPACK_BUILD_ICON
spack load $SPACK_BUILD_ICON
+else
+ echo "%icon.spack_cmd% is not defined. If you want to compile icon with spack, please provide a spack compile instruction string in your proj.yaml"
fi
# Need to get ECCODES DWD definitions:
--
GitLab