From c628b79d10170a6d7d91daba45664b2382b10e4f Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 5 Feb 2015 19:18:31 +0000
Subject: [PATCH] paraview: Standardize the naming of the ParaView installation
 directory Resolves bug-report
 http://www.openfoam.org/mantisbt/view.php?id=1201

---
 etc/config/paraview.csh | 7 +------
 etc/config/paraview.sh  | 8 +-------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/etc/config/paraview.csh b/etc/config/paraview.csh
index 59ddba269..4d8d74976 100644
--- a/etc/config/paraview.csh
+++ b/etc/config/paraview.csh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -85,11 +85,6 @@ endsw
 set paraviewInstDir=$WM_THIRD_PARTY_DIR/ParaView-${ParaView_VERSION}
 set paraviewArchName=ParaView-$ParaView_VERSION
 
-# Reset the name of the binary install directory for version 3
-if ( `echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\).*$/\1/'` == 3) then
-    set paraviewArchName=paraview-$ParaView_VERSION
-endif
-
 setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName
 
 # set paths if binaries or source are present
diff --git a/etc/config/paraview.sh b/etc/config/paraview.sh
index f883f3902..667b92af3 100644
--- a/etc/config/paraview.sh
+++ b/etc/config/paraview.sh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -93,12 +93,6 @@ export ParaView_VERSION ParaView_MAJOR
 paraviewInstDir=$WM_THIRD_PARTY_DIR/ParaView-$ParaView_VERSION
 paraviewArchName=ParaView-$ParaView_VERSION
 
-# Reset the name of the binary install directory for version 3
-if [ `echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\).*$/\1/'` -eq 3 ]
-then
-    paraviewArchName=paraview-$ParaView_VERSION
-fi
-
 export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName
 
 # set paths if binaries or source are present