From 8c2a67ad92316a5adddb66dc36c2028979379a8d Mon Sep 17 00:00:00 2001
From: Karl-Hermann Wieners <karl-hermann.wieners@mpimet.mpg.de>
Date: Tue, 19 Nov 2024 07:45:44 +0100
Subject: [PATCH] import: recognize exports for directory settings
---
importexp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/importexp b/importexp
index cf2990e..cc58375 100755
--- a/importexp
+++ b/importexp
@@ -74,7 +74,11 @@ do
echo "Analyzing '$RUN_SCRIPT'" >&2
# Get current directory settings
- eval $(perl -lne 'if(/^\s*((?:BUILD|MODEL)_DIR|basedir)=["'\'']?(.*?)["'\'']?\s*$/) {print "OLD_$1='\''$2'\''"}' $RUN_SCRIPT)
+ eval $(perl -lne '
+ if(m{^\s*(?:export\s+)?((?:BUILD|MODEL)_DIR|basedir)=["'\'']?(.*?)["'\'']?\s*$}) {
+ print "OLD_$1='\''$2'\''"
+ }
+ ' $RUN_SCRIPT)
# New style scripts will make sure that helper scripts are found.
# So no need to hack the . ./* calls (see 4. below)
--
GitLab