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

FIX: foamCleanPath wasn't working properly with etc/bashrc.

Browse Source 
The call to foamCleanPath from etc/{bashrc,cshrc} passes all the wildcards
together as a single argument - causing nothing to be cleaned.  Now split
the args on whitespace. Also added more IFS hacking to reduce forking.
This commit is contained in:
Mark Olesen
2008-05-21 10:07:28 +02:00
parent 71119dd6eb
commit e34c1c75f8
2 changed files with 73 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
etc/bashrc
View File

@ -175,11 +175,12 @@ wildCards="$FOAM_INST_DIR $HOME/$WM_PROJECT/$USER"
cleanPath=`$cleanProg "$PATH" "$wildCards"` && PATH="$cleanPath"
#- Clean LD_LIBRARY_PATH
export LD_LIBRARY_PATH=`$cleanProg "$LD_LIBRARY_PATH" "$wildCards"`
cleanPath=`$cleanProg "$LD_LIBRARY_PATH" "$wildCards"` && LD_LIBRARY_PATH="$cleanPath"
#- Clean MANPATH
export MANPATH=`$cleanProg "$MANPATH" "$wildCards"`
cleanPath=`$cleanProg "$MANPATH" "$wildCards"` && MANPATH="$cleanPath"
export PATH LD_LIBRARY_PATH MANPATH
# Source project setup files
# ~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -208,14 +209,17 @@ SOURCE $WM_PROJECT_DIR/etc/apps/cint/bashrc
cleanPath=`$cleanProg "$PATH"` && PATH="$cleanPath"
#- Clean LD_LIBRARY_PATH
export LD_LIBRARY_PATH=`$cleanProg "$LD_LIBRARY_PATH"`
cleanPath=`$cleanProg "$LD_LIBRARY_PATH"` && LD_LIBRARY_PATH="$cleanPath"
#- Clean MANPATH
export MANPATH=`$cleanProg "$MANPATH"`
cleanPath=`$cleanProg "$MANPATH"` && MANPATH="$cleanPath"
export PATH LD_LIBRARY_PATH MANPATH
#- Clean LD_PRELOAD
if [ "$LD_PRELOAD" != "" ]; then
export LD_PRELOAD=`$cleanProg "$LD_PRELOAD"`
cleanPath=`$cleanProg "$LD_PRELOAD"` && LD_PRELOAD="$cleanPath"
export LD_PRELOAD
fi