From 379eb71235082dd6cef918e4cba65347878b8983 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 31 Mar 2023 09:05:09 +0200
Subject: [PATCH] Philippe 31/03/2023: bugfix: profile_mesonh.ihm: correct
problem if conf_* file does not exist Was causing problems with CI on Gitlab
(reported by Cedric Gazoppi)
---
conf/profile_mesonh.ihm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/conf/profile_mesonh.ihm b/conf/profile_mesonh.ihm
index 249d1decb..5dd42a093 100755
--- a/conf/profile_mesonh.ihm
+++ b/conf/profile_mesonh.ihm
@@ -1,5 +1,5 @@
#!/bin/bash
-#MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier
+#MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier
#MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
#MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
#MNH_LIC for details. version 1.
@@ -171,8 +171,7 @@ export VARTTY=\`tty\`
#
# Variable depending on \$ARCH
#
-[ -f \${SRC_MESONH}/conf/conf_\${ARCH} ] && . \${SRC_MESONH}/conf/conf_\${ARCH}
-
+[ ! -f \${SRC_MESONH}/conf/conf_\${ARCH} ] || . \${SRC_MESONH}/conf/conf_\${ARCH}
#
# Optional Environnement variable/Module Env
#
--
GitLab