etc/apps - formatting and cint-svn from ThirdParty (or home)

etc/apps/cint/bashrc

@@ -31,9 +31,21 @@
 #
 #------------------------------------------------------------------------------
 
-export CINTSYSDIR=~/pub/CINT/cint7
-export PATH=$PATH:$CINTSYSDIR
-export MANPATH=$MANPATH:$CINTSYSDIR/doc
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$CINTSYSDIR
+for CINTSYSDIR in \
+    $HOME/pub/CINT/cint7 \
+    $WM_THIRD_PARTY_DIR/cint-svn/platforms/$WM_OPTIONS \
+    ;
+do
+    if [ -r $CINTSYSDIR ]
+    then
+        export CINTSYSDIR
+        export PATH=$PATH:$CINTSYSDIR/bin
+        export MANPATH=$MANPATH:$CINTSYSDIR/doc
+        export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$CINTSYSDIR/lib
+        break
+    fi
+done
+
+[ -r "$CINTSYSDIR" ] || unset CINTSYSDIR
 
 # -----------------------------------------------------------------------------

etc/apps/ensightFoam/bashrc → etc/apps/ensight/bashrc

@@ -32,19 +32,23 @@
 #------------------------------------------------------------------------------
 
 # fallback value
-if [ ! -d "$CEI_HOME" ]; then
+if [ ! -d "$CEI_HOME" ]
+then
     export CEI_HOME=/usr/local/ensight/CEI
 fi
 
-if [ -r $CEI_HOME ]; then
+if [ -r $CEI_HOME ]
+then
 
     # special treatment for 32bit FOAM and 64bit Ensight
-    if [ "$WM_ARCH" = linux -a `uname -m` = x86_64 ]; then
+    if [ "$WM_ARCH" = linux -a `uname -m` = x86_64 ]
+    then
         export CEI_ARCH=linux_2.6_32
     fi
 
     # add to path if required
-    if [ "$CEI_HOME/bin/ensight" != "`which ensight 2>/dev/null`" ]; then
+    if [ "$CEI_HOME/bin/ensight" != "`which ensight 2>/dev/null`" ]
+    then
         export PATH=$CEI_HOME/bin:$PATH
     fi
 

etc/apps/paraview/bashrc

@@ -33,7 +33,8 @@
 
 export CMAKE_HOME=$WM_THIRD_PARTY_DIR/cmake-2.4.6/platforms/$WM_ARCH
 
-if [ -r $CMAKE_HOME ]; then
+if [ -r $CMAKE_HOME ]
+then
     export PATH=$CMAKE_HOME/bin:$PATH
 fi
 
@@ -42,14 +43,16 @@ export ParaView_VERSION=2.4.4
 export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/ParaView$ParaView_VERSION
 export ParaView_DIR=$ParaView_INST_DIR/lib/paraview-2.4
 
-if [ -r $ParaView_INST_DIR ]; then
+if [ -r $ParaView_INST_DIR ]
+then
     export PV_INTERFACE_PATH=$FOAM_UTILITIES/postProcessing/graphics/PVFoamReader/PVFoamReader/Make
 
     export PATH=$ParaView_INST_DIR/bin:$PATH
     export LD_LIBRARY_PATH=${ParaView_INST_DIR}/lib:${ParaView_INST_DIR}/lib/vtk:${LD_LIBRARY_PATH}
 fi
 
-if [ -r $ParaView_DIR ]; then
+if [ -r $ParaView_DIR ]
+then
     export VTK_DIR=$ParaView_DIR/VTK
 fi
 

etc/apps/paraview3/bashrc

@@ -33,7 +33,8 @@
 
 export CMAKE_HOME=$WM_THIRD_PARTY_DIR/cmake-2.4.6/platforms/$WM_ARCH
 
-if [ -r $CMAKE_HOME ]; then
+if [ -r $CMAKE_HOME ]
+then
     export PATH=$CMAKE_HOME/bin:$PATH
 else
     unset CMAKE_HOME
@@ -44,14 +45,16 @@ export ParaView_VERSION="3.3-cvs"
 export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/ParaView$ParaView_VERSION
 export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
 
-if [ "$PYTHONPATH" ]; then
+if [ "$PYTHONPATH" ]
+then
     export PYTHONPATH=$PYTHONPATH:$ParaView_DIR/Utilities/VTKPythonWrapping:$ParaView_DIR/lib/paraview-3.3
 else
     export PYTHONPATH=$ParaView_DIR/Utilities/VTKPythonWrapping:$ParaView_DIR/lib/paraview-3.3
 fi
 
 
-if [ -r $ParaView_DIR ]; then
+if [ -r $ParaView_DIR ]
+then
     export PATH=$ParaView_DIR/bin:$PATH
     export LD_LIBRARY_PATH=$ParaView_DIR/bin:$LD_LIBRARY_PATH
     export PV_PLUGIN_PATH=$FOAM_LIBBIN

etc/bashrc

@@ -33,7 +33,7 @@
 #------------------------------------------------------------------------------
 
 export WM_PROJECT=OpenFOAM
-#export WM_PROJECT_VERSION=1.5.x
+# export WM_PROJECT_VERSION=1.5.x
 : ${WM_PROJECT_VERSION:=dev}; export WM_PROJECT_VERSION
 
 
@@ -198,7 +198,7 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.sh
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc
 _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc
-# _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/bashrc
+_foamSource $WM_PROJECT_DIR/etc/apps/ensight/bashrc
 _foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc
 
 

etc/cshrc

@@ -32,7 +32,7 @@
 #------------------------------------------------------------------------------
 
 setenv WM_PROJECT OpenFOAM
-#setenv WM_PROJECT_VERSION 1.5.x
+# setenv WM_PROJECT_VERSION 1.5.x
 if ( ! $?WM_PROJECT_VERSION ) setenv WM_PROJECT_VERSION dev
 
 #!!User:
@@ -194,7 +194,7 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.csh
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc
 _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc
-# _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/cshrc
+# _foamSource $WM_PROJECT_DIR/etc/apps/ensight/cshrc
 
 
 # Again clean environment (path, PATH, MANPATH, LD_LIBRARY_PATH)