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

17
etc/config.sh/unset
View File

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