zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: _foamAddMan was being left a remnant in the environment after sourced settings files

Browse Source
This commit is contained in:
Mark Olesen
2010-03-09 09:16:47 +01:00
parent 4fdd5b3b18
commit 77f0192dac
10 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/aliases.csh
View File

@ -22,7 +22,7 @@
# along with OpenFOAM; if not, write to the Free Software Foundation, # along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
# Script # File
# aliases.csh # aliases.csh
# #
# Description # Description

2
etc/aliases.sh
View File

@ -22,7 +22,7 @@
# along with OpenFOAM; if not, write to the Free Software Foundation, # along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
# Script # File
# aliases.sh # aliases.sh
# #
# Description # Description

2
etc/apps/ensight/bashrc
View File

@ -22,7 +22,7 @@
# along with OpenFOAM; if not, write to the Free Software Foundation, # along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
# Script # File
# ensight/bashrc # ensight/bashrc
# #
# Description # Description

2
etc/apps/ensight/cshrc
View File

@ -22,7 +22,7 @@
# along with OpenFOAM; if not, write to the Free Software Foundation, # along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
# Script # File
# ensight/cshrc # ensight/cshrc
# #
# Description # Description

2
etc/apps/paraview3/bashrc
View File

@ -22,7 +22,7 @@
# along with OpenFOAM; if not, write to the Free Software Foundation, # along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
# Script # File
# paraview3/bashrc # paraview3/bashrc
# #
# Description # Description

2
etc/apps/paraview3/cshrc
View File

@ -22,7 +22,7 @@
# along with OpenFOAM; if not, write to the Free Software Foundation, # along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
# Script # File
# paraview3/cshrc # paraview3/cshrc
# #
# Description # Description

2
etc/bashrc
View File

@ -22,7 +22,7 @@
# along with OpenFOAM; if not, write to the Free Software Foundation, # along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
# Script # File
# etc/bashrc # etc/bashrc
# #
# Description # Description

2
etc/cshrc
View File

@ -22,7 +22,7 @@
# along with OpenFOAM; if not, write to the Free Software Foundation, # along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
# Script # File
# etc/cshrc # etc/cshrc
# #
# Description # Description

15
etc/settings.csh
View File

@ -22,7 +22,7 @@
# along with OpenFOAM; if not, write to the Free Software Foundation, # along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
# Script # File
# etc/settings.csh # etc/settings.csh
# #
# Description # Description
@ -36,7 +36,7 @@ alias _foamAddPath 'set path=(\!* $path)'
# prefix to LD_LIBRARY_PATH # prefix to LD_LIBRARY_PATH
alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}' alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}'
# prefix to MANPATH # prefix to MANPATH
alias _foamAddManPath 'setenv MANPATH \!*\:${MANPATH}' alias _foamAddMan 'setenv MANPATH \!*\:${MANPATH}'
# location of the jobControl directory # location of the jobControl directory
setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl
@ -80,7 +80,7 @@ _foamAddLib $FOAM_USER_LIBBIN
# Select compiler installation # Select compiler installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# compilerInstall = OpenFOAM | System # compilerInstall = OpenFOAM | system
set compilerInstall=OpenFOAM set compilerInstall=OpenFOAM
switch ("$compilerInstall") switch ("$compilerInstall")
@ -112,14 +112,14 @@ case OpenFOAM:
echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:" echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
echo " Cannot find $WM_COMPILER_DIR installation." echo " Cannot find $WM_COMPILER_DIR installation."
echo " Please install this compiler version or if you wish to use the system compiler," 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 echo
endif endif
_foamAddPath ${WM_COMPILER_DIR}/bin _foamAddPath ${WM_COMPILER_DIR}/bin
_foamAddLib ${WM_COMPILER_DIR}/lib${WM_COMPILER_LIB_ARCH} _foamAddLib ${WM_COMPILER_DIR}/lib${WM_COMPILER_LIB_ARCH}
_foamAddLib ${WM_COMPILER_DIR}/lib _foamAddLib ${WM_COMPILER_DIR}/lib
_foamAddManPath ${WM_COMPILER_DIR}/man _foamAddMan ${WM_COMPILER_DIR}/man
breaksw breaksw
endsw endsw
@ -141,7 +141,7 @@ case OPENMPI:
_foamAddPath $MPI_ARCH_PATH/bin _foamAddPath $MPI_ARCH_PATH/bin
_foamAddLib $MPI_ARCH_PATH/lib _foamAddLib $MPI_ARCH_PATH/lib
_foamAddManPath $MPI_ARCH_PATH/man _foamAddMan $MPI_ARCH_PATH/man
setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
unset mpi_version unset mpi_version
@ -178,7 +178,7 @@ case MPICH:
_foamAddPath $MPI_ARCH_PATH/bin _foamAddPath $MPI_ARCH_PATH/bin
_foamAddLib $MPI_ARCH_PATH/lib _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 setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
unset mpi_version unset mpi_version
@ -287,6 +287,7 @@ endif
# ~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~
unalias _foamAddPath unalias _foamAddPath
unalias _foamAddLib unalias _foamAddLib
unalias _foamAddMan
unset minBufferSize unset minBufferSize
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

16
etc/settings.sh
View File

@ -22,7 +22,7 @@
# along with OpenFOAM; if not, write to the Free Software Foundation, # along with OpenFOAM; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
# Script # File
# etc/settings.sh # etc/settings.sh
# #
# Description # Description
@ -52,7 +52,7 @@ _foamAddLib()
} }
# prefix to MANPATH # prefix to MANPATH
_foamAddManPath() _foamAddMan()
{ {
while [ $# -ge 1 ] while [ $# -ge 1 ]
do do
@ -104,7 +104,7 @@ unset compilerBin compilerLib compilerMan
# Select compiler installation # Select compiler installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# compilerInstall = OpenFOAM | System # compilerInstall = OpenFOAM | system
compilerInstall=OpenFOAM compilerInstall=OpenFOAM
case "${compilerInstall:-OpenFOAM}" in case "${compilerInstall:-OpenFOAM}" in
@ -142,7 +142,7 @@ OpenFOAM)
echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:" echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:"
echo " Cannot find $WM_COMPILER_DIR installation." echo " Cannot find $WM_COMPILER_DIR installation."
echo " Please install this compiler version or if you wish to use the system compiler," 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 echo
fi fi
@ -156,7 +156,7 @@ if [ -d "$compilerBin" ]
then then
_foamAddPath $compilerBin _foamAddPath $compilerBin
_foamAddLib $compilerLib _foamAddLib $compilerLib
_foamAddManPath $compilerMan _foamAddMan $compilerMan
fi fi
unset compilerBin compilerLib compilerMan compilerInstall unset compilerBin compilerLib compilerMan compilerInstall
@ -177,7 +177,7 @@ OPENMPI)
_foamAddPath $MPI_ARCH_PATH/bin _foamAddPath $MPI_ARCH_PATH/bin
_foamAddLib $MPI_ARCH_PATH/lib _foamAddLib $MPI_ARCH_PATH/lib
_foamAddManPath $MPI_ARCH_PATH/man _foamAddMan $MPI_ARCH_PATH/man
export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
unset mpi_version unset mpi_version
@ -212,7 +212,7 @@ MPICH)
_foamAddPath $MPI_ARCH_PATH/bin _foamAddPath $MPI_ARCH_PATH/bin
_foamAddLib $MPI_ARCH_PATH/lib _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 export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
unset mpi_version unset mpi_version
@ -318,6 +318,6 @@ export MPI_BUFFER_SIZE
# cleanup environment: # cleanup environment:
# ~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~
unset _foamAddPath _foamAddLib minBufferSize unset _foamAddPath _foamAddLib _foamAddMan minBufferSize
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------