zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

etc/config.*/unset: Updated for changes in foamOldDirs

Browse Source 
Patch contributed by Bruno Santos
Resolves bug-report http://bugs.openfoam.org/view.php?id=2031
This commit is contained in:
Henry Weller
2016-05-05 23:37:33 +01:00
parent 72572b64c6
commit 6dfb01dc1f
3 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
etc/bashrc
View File

@ -105,8 +105,8 @@ export FOAM_SIGFPE=
################################################################################ ################################################################################
# The old dirs to be cleaned from the environment variables # The old dirs to be cleaned from the environment variables
foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR \ foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR $HOME/$WM_PROJECT/$USER \
$WM_PROJECT_SITE $HOME/$WM_PROJECT/$USER" $WM_PROJECT_SITE $FOAM_SITE_APPBIN $FOAM_SITE_LIBBIN"
# Location of installation # Location of installation
# ~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~

26
etc/config.csh/unset
View File

@ -37,23 +37,10 @@ if ( $?WM_PROJECT_DIR ) then
if ( ! -f "$foamClean" || ! -x "$foamClean" ) unset foamClean if ( ! -f "$foamClean" || ! -x "$foamClean" ) unset foamClean
endif endif
set foamOldDirs="" # The old dirs to be cleaned from the environment variables
set foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR \
# The old dirs to be cleaned from the various environment variables $HOME/$WM_PROJECT/$LOGNAME $WM_PROJECT_SITE \
# - remove anything under top-level directory. $FOAM_SITE_APPBIN $FOAM_SITE_LIBBIN $ParaView_DIR"
# NB: the WM_PROJECT_INST_DIR might not be identical between versions
#
if ( $?WM_PROJECT_INST_DIR ) then
set foamOldDirs="$WM_PROJECT_INST_DIR"
endif
if ( $?WM_PROJECT ) then
set foamOldDirs="$HOME/$WM_PROJECT/$LOGNAME $foamOldDirs"
endif
if ( $?WM_PROJECT_SITE ) then
set foamOldDirs="$WM_PROJECT_SITE $foamOldDirs"
endif
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@ -64,12 +51,15 @@ unsetenv WM_ARCH_OPTION
unsetenv WM_CC unsetenv WM_CC
unsetenv WM_CFLAGS unsetenv WM_CFLAGS
unsetenv WM_COMPILER unsetenv WM_COMPILER
unsetenv WM_COMPILER_TYPE
unsetenv WM_COMPILER_LIB_ARCH unsetenv WM_COMPILER_LIB_ARCH
unsetenv WM_COMPILE_OPTION unsetenv WM_COMPILE_OPTION
unsetenv WM_CXX unsetenv WM_CXX
unsetenv WM_CXXFLAGS unsetenv WM_CXXFLAGS
unsetenv WM_DIR unsetenv WM_DIR
unsetenv WM_HOSTS unsetenv WM_HOSTS
unsetenv WM_LABEL_OPTION
unsetenv WM_LABEL_SIZE
unsetenv WM_LDFLAGS unsetenv WM_LDFLAGS
unsetenv WM_LINK_LANGUAGE unsetenv WM_LINK_LANGUAGE
unsetenv WM_MPLIB unsetenv WM_MPLIB
@ -126,6 +116,8 @@ unsetenv ENSIGHT9_READER
unsetenv CMAKE_HOME unsetenv CMAKE_HOME
unsetenv ParaView_DIR unsetenv ParaView_DIR
unsetenv ParaView_INCLUDE_DIR unsetenv ParaView_INCLUDE_DIR
unsetenv ParaView_MAJOR
unsetenv ParaView_VERSION
unsetenv PV_PLUGIN_PATH unsetenv PV_PLUGIN_PATH

17
etc/config.sh/unset
View File

@ -33,15 +33,9 @@
foamClean=$WM_PROJECT_DIR/bin/foamCleanPath foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
[ -f "$foamClean" -a -x "$foamClean" ] || unset foamClean [ -f "$foamClean" -a -x "$foamClean" ] || unset foamClean
# The old dirs to be cleaned from the various environment variables # The old dirs to be cleaned from the environment variables
# - remove anything under top-level directory. foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR $HOME/$WM_PROJECT/$USER \
# NB: the WM_PROJECT_INST_DIR might not be identical between versions $WM_PROJECT_SITE $FOAM_SITE_APPBIN $FOAM_SITE_LIBBIN $ParaView_DIR"
#
foamOldDirs="$WM_PROJECT_INST_DIR $WM_PROJECT_SITE"
if [ -n "$WM_PROJECT" ]
then
foamOldDirs="$foamOldDirs $HOME/$WM_PROJECT/$USER_SITE"
fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Unset WM_* environment variables # Unset WM_* environment variables
@ -51,12 +45,15 @@ unset WM_ARCH_OPTION
unset WM_CC unset WM_CC
unset WM_CFLAGS unset WM_CFLAGS
unset WM_COMPILER unset WM_COMPILER
unset WM_COMPILER_TYPE
unset WM_COMPILER_LIB_ARCH unset WM_COMPILER_LIB_ARCH
unset WM_COMPILE_OPTION unset WM_COMPILE_OPTION
unset WM_CXX unset WM_CXX
unset WM_CXXFLAGS unset WM_CXXFLAGS
unset WM_DIR unset WM_DIR
unset WM_HOSTS unset WM_HOSTS
unset WM_LABEL_OPTION
unset WM_LABEL_SIZE
unset WM_LDFLAGS unset WM_LDFLAGS
unset WM_LINK_LANGUAGE unset WM_LINK_LANGUAGE
unset WM_MPLIB unset WM_MPLIB
@ -113,6 +110,8 @@ unset ENSIGHT9_READER
unset CMAKE_HOME unset CMAKE_HOME
unset ParaView_DIR unset ParaView_DIR
unset ParaView_INCLUDE_DIR unset ParaView_INCLUDE_DIR
unset ParaView_MAJOR
unset ParaView_VERSION
unset PV_PLUGIN_PATH unset PV_PLUGIN_PATH