From f4dee922ab2c39fac31e5e2b039e346ac6d41b5c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 29 Sep 2010 10:50:49 +0100
Subject: [PATCH] Start-up scripts: The environment variables are now set
unconditionally as in 1.7.x
---
etc/apps/paraview3/bashrc | 7 ++++---
etc/apps/paraview3/cshrc | 7 ++++---
etc/bashrc | 2 +-
etc/cellModels | 2 +-
etc/controlDict | 2 +-
etc/cshrc | 2 +-
6 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc
index 51965e47d61..e160fa59e8f 100644
--- a/etc/apps/paraview3/bashrc
+++ b/etc/apps/paraview3/bashrc
@@ -50,9 +50,9 @@ do
done
-# set VERSION and MAJOR (version) variables if not already set
-[ -n "$ParaView_VERSION" ] || ParaView_VERSION=3.8.0
-[ -n "$ParaView_MAJOR" ] || ParaView_MAJOR=unknown
+# set VERSION and MAJOR (version) variables
+ParaView_VERSION=3.8.0
+ParaView_MAJOR=unknown
# if needed, set MAJOR version to correspond to VERSION
# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
@@ -95,4 +95,5 @@ fi
unset cleaned cmake paraviewInstDir paraviewPython
+
# -----------------------------------------------------------------------------
diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc
index a69608c9d32..cdbe92277a0 100644
--- a/etc/apps/paraview3/cshrc
+++ b/etc/apps/paraview3/cshrc
@@ -48,9 +48,9 @@ foreach cmake ( cmake-2.8.1 cmake-2.8.0 cmake-2.6.4 )
endif
end
-# set VERSION and MAJOR (version) variables if not already set
-if ( ! $?ParaView_VERSION ) setenv ParaView_VERSION 3.8.0
-if ( ! $?ParaView_MAJOR ) setenv ParaView_MAJOR unknown
+# set VERSION and MAJOR (version) variables
+setenv ParaView_VERSION 3.8.0
+setenv ParaView_MAJOR unknown
# if needed, set MAJOR version to correspond to VERSION
# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
@@ -91,4 +91,5 @@ endif
unset cleaned cmake paraviewInstDir paraviewPython
+
# -----------------------------------------------------------------------------
diff --git a/etc/bashrc b/etc/bashrc
index ad866d049b7..e5c050b44ff 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -32,7 +32,7 @@
#------------------------------------------------------------------------------
export WM_PROJECT=OpenFOAM
-[ -z "$WM_PROJECT_VERSION" ] && export WM_PROJECT_VERSION=dev
+export WM_PROJECT_VERSION=dev
################################################################################
# USER EDITABLE PART. Note changes made here may be lost with the next upgrade
diff --git a/etc/cellModels b/etc/cellModels
index eb6f1b95079..a90eaa94e72 100644
--- a/etc/cellModels
+++ b/etc/cellModels
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: 1.7 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/controlDict b/etc/controlDict
index 691e9701243..f989950f269 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
+| \\ / O peration | Version: 1.7 |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
diff --git a/etc/cshrc b/etc/cshrc
index 9f55d62ab62..7ceff2ff58e 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -31,7 +31,7 @@
#------------------------------------------------------------------------------
setenv WM_PROJECT OpenFOAM
-if ( ! $?WM_PROJECT_VERSION ) setenv WM_PROJECT_VERSION dev
+setenv WM_PROJECT_VERSION dev
################################################################################
# USER EDITABLE PART. Note changes made here may be lost with the next upgrade
--
GitLab