diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake index 308eaaf175..6851210bd7 100755 --- a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake +++ b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake @@ -4,23 +4,17 @@ set -x if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ] then - case "$ParaView_VERSION" in - 3* | git) + [ -n "$PV_PLUGIN_PATH" ] || { + echo "$0 : PV_PLUGIN_PATH not valid - it is unset" + exit 1 + } - if [ ! -n "${PV_PLUGIN_PATH}" ] - then - echo "$0 : PV_PLUGIN_PATH not a valid." - exit 1 - fi + # ensure CMake gets the correct C++ compiler + [ -n "$WM_CXX" ] && export CXX="$WM_CXX" - # ensure CMake gets the correct C++ compiler - [ -n "$WM_CXX" ] && export CXX="$WM_CXX" - - wmake libso vtkPV3Readers - PV3blockMeshReader/Allwmake - PV3FoamReader/Allwmake - ;; - esac + wmake libso vtkPV3Readers + PV3blockMeshReader/Allwmake + PV3FoamReader/Allwmake fi # ----------------------------------------------------------------- end-of-file diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake index 0b06722592..c99e05fd6b 100755 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake @@ -4,18 +4,14 @@ set -x if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ] then - case "$ParaView_VERSION" in - 3* | git) - wmake libso vtkPV3Foam - ( - cd PV3FoamReader - mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1 - cd Make/$WM_OPTIONS - cmake ../.. - make - ) - ;; - esac + wmake libso vtkPV3Foam + ( + cd PV3FoamReader + mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1 + cd Make/$WM_OPTIONS + cmake ../.. + make + ) fi # ----------------------------------------------------------------- end-of-file diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake index c186a5c664..4f055b3c0f 100755 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake @@ -4,18 +4,14 @@ set -x if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ] then - case "$ParaView_VERSION" in - 3* | git) - wmake libso vtkPV3blockMesh - ( - cd PV3blockMeshReader - mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1 - cd Make/$WM_OPTIONS - cmake ../.. - make - ) - ;; - esac + wmake libso vtkPV3blockMesh + ( + cd PV3blockMeshReader + mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1 + cd Make/$WM_OPTIONS + cmake ../.. + make + ) fi # ----------------------------------------------------------------- end-of-file diff --git a/bin/paraFoam b/bin/paraFoam index ee13790c01..540f90dc93 100755 --- a/bin/paraFoam +++ b/bin/paraFoam @@ -168,17 +168,14 @@ builtin | OpenFOAM) ;; esac -case "$ParaView_VERSION" in -3* | git) - # only create/remove caseFile if it didn't already exist - [ -e $caseFile ] || { - trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT - touch "$caseFile" - echo "created temporary '$caseFile'" - } - paraview --data="$caseFile" - ;; +# only create/remove caseFile if it didn't already exist +[ -e $caseFile ] || { + trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT + touch "$caseFile" + echo "created temporary '$caseFile'" +} + +paraview --data="$caseFile" -esac #------------------------------------------------------------------------------