From 77f0192dacb97a95c8295ff5b7379819c50971c9 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 9 Mar 2010 09:16:47 +0100 Subject: [PATCH] BUG: _foamAddMan was being left a remnant in the environment after sourced settings files --- etc/aliases.csh | 2 +- etc/aliases.sh | 2 +- etc/apps/ensight/bashrc | 2 +- etc/apps/ensight/cshrc | 2 +- etc/apps/paraview3/bashrc | 2 +- etc/apps/paraview3/cshrc | 2 +- etc/bashrc | 2 +- etc/cshrc | 2 +- etc/settings.csh | 17 +++++++++-------- etc/settings.sh | 18 +++++++++--------- 10 files changed, 26 insertions(+), 25 deletions(-) diff --git a/etc/aliases.csh b/etc/aliases.csh index 394ffffc12..892ffc5211 100644 --- a/etc/aliases.csh +++ b/etc/aliases.csh @@ -22,7 +22,7 @@ # along with OpenFOAM; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -# Script +# File # aliases.csh # # Description diff --git a/etc/aliases.sh b/etc/aliases.sh index 4542d3fff1..0907e8a9c8 100644 --- a/etc/aliases.sh +++ b/etc/aliases.sh @@ -22,7 +22,7 @@ # along with OpenFOAM; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -# Script +# File # aliases.sh # # Description diff --git a/etc/apps/ensight/bashrc b/etc/apps/ensight/bashrc index f47c0f6ca3..8eec1cddc2 100644 --- a/etc/apps/ensight/bashrc +++ b/etc/apps/ensight/bashrc @@ -22,7 +22,7 @@ # along with OpenFOAM; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -# Script +# File # ensight/bashrc # # Description diff --git a/etc/apps/ensight/cshrc b/etc/apps/ensight/cshrc index 0126a8ea50..7367af5083 100644 --- a/etc/apps/ensight/cshrc +++ b/etc/apps/ensight/cshrc @@ -22,7 +22,7 @@ # along with OpenFOAM; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -# Script +# File # ensight/cshrc # # Description diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc index c623244a59..738d3add88 100644 --- a/etc/apps/paraview3/bashrc +++ b/etc/apps/paraview3/bashrc @@ -22,7 +22,7 @@ # along with OpenFOAM; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -# Script +# File # paraview3/bashrc # # Description diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc index befb2e972d..3d8690b8d9 100644 --- a/etc/apps/paraview3/cshrc +++ b/etc/apps/paraview3/cshrc @@ -22,7 +22,7 @@ # along with OpenFOAM; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -# Script +# File # paraview3/cshrc # # Description diff --git a/etc/bashrc b/etc/bashrc index 26ad745540..bb9d6215a8 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -22,7 +22,7 @@ # along with OpenFOAM; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -# Script +# File # etc/bashrc # # Description diff --git a/etc/cshrc b/etc/cshrc index 0e6b3872f2..b0b6ec822f 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -22,7 +22,7 @@ # along with OpenFOAM; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -# Script +# File # etc/cshrc # # Description diff --git a/etc/settings.csh b/etc/settings.csh index 78fd05490f..88c8f286d6 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -22,7 +22,7 @@ # along with OpenFOAM; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -# Script +# File # etc/settings.csh # # Description @@ -36,7 +36,7 @@ alias _foamAddPath 'set path=(\!* $path)' # prefix to LD_LIBRARY_PATH alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}' # prefix to MANPATH -alias _foamAddManPath 'setenv MANPATH \!*\:${MANPATH}' +alias _foamAddMan 'setenv MANPATH \!*\:${MANPATH}' # location of the jobControl directory setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl @@ -80,7 +80,7 @@ _foamAddLib $FOAM_USER_LIBBIN # Select compiler installation # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# compilerInstall = OpenFOAM | System +# compilerInstall = OpenFOAM | system set compilerInstall=OpenFOAM switch ("$compilerInstall") @@ -112,14 +112,14 @@ case OpenFOAM: echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:" echo " Cannot find $WM_COMPILER_DIR installation." echo " Please install this compiler version or if you wish to use the system compiler," - echo " change the 'compilerInstall' setting to 'System' in this file" + echo " change the 'compilerInstall' setting to 'system' in this file" echo endif _foamAddPath ${WM_COMPILER_DIR}/bin _foamAddLib ${WM_COMPILER_DIR}/lib${WM_COMPILER_LIB_ARCH} _foamAddLib ${WM_COMPILER_DIR}/lib - _foamAddManPath ${WM_COMPILER_DIR}/man + _foamAddMan ${WM_COMPILER_DIR}/man breaksw endsw @@ -141,7 +141,7 @@ case OPENMPI: _foamAddPath $MPI_ARCH_PATH/bin _foamAddLib $MPI_ARCH_PATH/lib - _foamAddManPath $MPI_ARCH_PATH/man + _foamAddMan $MPI_ARCH_PATH/man setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version unset mpi_version @@ -154,7 +154,7 @@ case SYSTEMOPENMPI: set mpi_version=openmpi-system # Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI - setenv PINC `mpicc --showme:compile` + setenv PINC `mpicc --showme:compile` setenv PLIBS `mpicc --showme:link` set libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'` @@ -178,7 +178,7 @@ case MPICH: _foamAddPath $MPI_ARCH_PATH/bin _foamAddLib $MPI_ARCH_PATH/lib - _foamAddManPath $MPI_ARCH_PATH/share/man + _foamAddMan $MPI_ARCH_PATH/share/man setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version unset mpi_version @@ -287,6 +287,7 @@ endif # ~~~~~~~~~~~~~~~~~~~~ unalias _foamAddPath unalias _foamAddLib +unalias _foamAddMan unset minBufferSize # ----------------------------------------------------------------------------- diff --git a/etc/settings.sh b/etc/settings.sh index 43fc884346..7373e81824 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -22,7 +22,7 @@ # along with OpenFOAM; if not, write to the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -# Script +# File # etc/settings.sh # # Description @@ -52,7 +52,7 @@ _foamAddLib() } # prefix to MANPATH -_foamAddManPath() +_foamAddMan() { while [ $# -ge 1 ] do @@ -104,7 +104,7 @@ unset compilerBin compilerLib compilerMan # Select compiler installation # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# compilerInstall = OpenFOAM | System +# compilerInstall = OpenFOAM | system compilerInstall=OpenFOAM case "${compilerInstall:-OpenFOAM}" in @@ -142,7 +142,7 @@ OpenFOAM) echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:" echo " Cannot find $WM_COMPILER_DIR installation." echo " Please install this compiler version or if you wish to use the system compiler," - echo " change the 'compilerInstall' setting to 'System' in this file" + echo " change the 'compilerInstall' setting to 'system' in this file" echo fi @@ -156,7 +156,7 @@ if [ -d "$compilerBin" ] then _foamAddPath $compilerBin _foamAddLib $compilerLib - _foamAddManPath $compilerMan + _foamAddMan $compilerMan fi unset compilerBin compilerLib compilerMan compilerInstall @@ -177,7 +177,7 @@ OPENMPI) _foamAddPath $MPI_ARCH_PATH/bin _foamAddLib $MPI_ARCH_PATH/lib - _foamAddManPath $MPI_ARCH_PATH/man + _foamAddMan $MPI_ARCH_PATH/man export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version unset mpi_version @@ -187,7 +187,7 @@ SYSTEMOPENMPI) mpi_version=openmpi-system # Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI - export PINC=`mpicc --showme:compile` + export PINC=`mpicc --showme:compile` export PLIBS=`mpicc --showme:link` libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'` @@ -212,7 +212,7 @@ MPICH) _foamAddPath $MPI_ARCH_PATH/bin _foamAddLib $MPI_ARCH_PATH/lib - _foamAddManPath $MPI_ARCH_PATH/share/man + _foamAddMan $MPI_ARCH_PATH/share/man export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version unset mpi_version @@ -318,6 +318,6 @@ export MPI_BUFFER_SIZE # cleanup environment: # ~~~~~~~~~~~~~~~~~~~~ -unset _foamAddPath _foamAddLib minBufferSize +unset _foamAddPath _foamAddLib _foamAddMan minBufferSize # -----------------------------------------------------------------------------