From 1c1b1874eadf1acdbe603dd916f9ccd6e3348a96 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 7 Aug 2019 18:36:08 +0200 Subject: [PATCH] CONFIG: accept 'system' for foamConfigurePaths -paraview --- bin/tools/foamConfigurePaths | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/tools/foamConfigurePaths b/bin/tools/foamConfigurePaths index 12c1297e04..8c997f89ea 100755 --- a/bin/tools/foamConfigurePaths +++ b/bin/tools/foamConfigurePaths @@ -66,7 +66,7 @@ Components -scotch-path DIR specify 'SCOTCH_ARCH_PATH' (eg, /opt/scotch_6.0.4) Graphics - -paraview VER specify 'ParaView_VERSION' (eg, 5.4.1) + -paraview VER specify 'ParaView_VERSION' (eg, 5.4.1 or system) -paraview-qt VER specify 'ParaView_QT' (eg, qt-system) -paraview-path DIR specify 'ParaView_DIR' (eg, /opt/ParaView-5.4.1) -vtk VER specify 'vtk_version' (eg, VTK-7.1.0) @@ -580,11 +580,11 @@ do -paraview | -paraviewVersion | --paraviewVersion) # Replace ParaView_VERSION=... - expected="[5-9][.0-9]*" + expected="[5-9][.0-9]*" # but also accept system optionValue=$(getOptionValue "$@") _matches "$optionValue" "$expected" || \ + [ "$optionValue" != "${optionValue%system}" ] || \ die "'$1' has bad value: '$optionValue'" - replace etc/config.sh/paraview ParaView_VERSION "$optionValue" replace etc/config.csh/paraview ParaView_VERSION "$optionValue" adjusted=true