From b0c69d5eb46cb6fbd8f60fbebf016b5e7e286b1f Mon Sep 17 00:00:00 2001
From: Karl-Hermann Wieners <karl-hermann.wieners@mpimet.mpg.de>
Date: Thu, 20 Jul 2023 11:26:42 +0200
Subject: [PATCH] importexp: add support for Lumi test scripts
---
importexp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/importexp b/importexp
index 62d5107..b897102 100755
--- a/importexp
+++ b/importexp
@@ -108,7 +108,7 @@ done\
sed -r '
s@^(\s*)(cat\s+\$thisscript)@\1: \2@
- /^\s*\$\{START\}/ i'"$SHOW_HERE_DOCS"'
+ /^\s*(\$\{START\}|srun)/ i'"$SHOW_HERE_DOCS"'
s:^(\s*)(set\s+\+x\s*$|(set\s+\+\w+)x):\1\3:
'"${REMOVE_ERROR_FLAG_SH-}"'
s:^(\s*)SCRIPT_DIR=.*$:\1SCRIPT_DIR='$WORK_DIR':
@@ -116,7 +116,7 @@ done\
s:^(\s*)BUILD_DIR=.*$:\1BUILD_DIR='$MODEL_BASE_DIR/$BUILD_SUBDIR':
s:^(\s*)EXPDIR=.*$:\1EXPDIR='$WORK_DIR':
s:^(\s*\.\s+)\./:\1'$RUN_BASE_DIR'/:
- s:^(\s*(export\s+)?MODEL=")\$\{basedir\}:\1'$MODEL_BASE_DIR':
+ s:^(\s*(export\s+)?basedir=).*$:\1'$MODEL_BASE_DIR/$BUILD_SUBDIR':
' "$RUN_SCRIPT" > $RUN_FILE
# Get script shell without possible +x/-e settings
--
GitLab