From 0b41521d98df45be2365a3655349173b0d3c3f5b Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 1 Jul 2020 15:07:57 +0200
Subject: [PATCH] CONFIG: avoid triggering dash expansion bug (fixes #1757)
- use long form to avoid dash 0.5.8 error (ubuntu bionic)
- consolidate the prefix handling into modules/Allwmake
---
Allwmake | 12 ------------
modules/Allwmake | 15 ++++++++++++++-
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/Allwmake b/Allwmake
index 240e7e26216..6136570be06 100755
--- a/Allwmake
+++ b/Allwmake
@@ -80,18 +80,6 @@ then
echo
elif [ -d "$WM_PROJECT_DIR/modules" ]
then
- echo "========================================"
- echo "Compile OpenFOAM modules"
- echo " ignoring possible compilation errors"
- echo " make certain to check the output file"
- echo
- set +e
- export WM_CONTINUE_ON_ERROR=true
-
- # Default build into OpenFOAM project locations
- : "${FOAM_MODULE_PREFIX:=${FOAM_LIBBIN%/*}}"
- export FOAM_MODULE_PREFIX
-
(cd "$WM_PROJECT_DIR/modules" 2>/dev/null && wmake -all)
fi
diff --git a/modules/Allwmake b/modules/Allwmake
index 1a6ca948675..b6bf9301a57 100755
--- a/modules/Allwmake
+++ b/modules/Allwmake
@@ -7,9 +7,22 @@ targetType=libso
# Default build into OpenFOAM project locations unless specified with
# -prefix or FOAM_MODULE_PREFIX env varable
-: "${FOAM_MODULE_PREFIX:=${FOAM_LIBBIN%/*}}"
+# Long form to avoid dash 0.5.8 error (issue #1757)
+[ -n "$FOAM_MODULE_PREFIX" ] || FOAM_MODULE_PREFIX="${FOAM_LIBBIN%/*}"
export FOAM_MODULE_PREFIX
+echo "========================================"
+echo "Compile OpenFOAM modules"
+echo "prefix = $FOAM_MODULE_PREFIX"
+echo
+echo " ignoring possible compilation errors"
+echo " make certain to check the output file"
+echo
+set +e
+export WM_CONTINUE_ON_ERROR=true
+
+#------------------------------------------------------------------------------
+
for moduleName in $(./list-modules)
do
if [ -d "$moduleName" ]
--
GitLab