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

attempt to preserve the installation directory 'FOAM_INST_DIR' when sourcing files

Browse Source
This commit is contained in:
Mark Olesen
2008-05-08 14:32:40 +02:00
parent 8bdd3501d7
commit 73cf0583d5
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
wmake/wmakeScheduler
View File

@ -88,28 +88,39 @@ esac
# check <installedProject/.$WM_PROJECT-$WM_PROJECT_VERSION/ # check <installedProject/.$WM_PROJECT-$WM_PROJECT_VERSION/
if [ "$WM_PROJECT" ]; then if [ "$WM_PROJECT" ]; then
: ${FOAM_DOT_DIR:=.$WM_PROJECT-$WM_PROJECT_VERSION} : ${FOAM_DOT_DIR:=.$WM_PROJECT-$WM_PROJECT_VERSION}
for i in \ for i in \
$HOME/$FOAM_DOT_DIR \ $HOME/$FOAM_DOT_DIR \
$HOME/.$WM_PROJECT/$WM_PROJECT_VERSION \ $HOME/.$WM_PROJECT/$WM_PROJECT_VERSION \
$HOME/.$WM_PROJECT \ $HOME/.$WM_PROJECT \
$WM_PROJECT_DIR/etc \ $WM_PROJECT_DIR/etc \
$WM_PROJECT_DIR/$FOAM_DOT_DIR \ $WM_PROJECT_DIR/$FOAM_DOT_DIR \
; ;
do do
if [ -f "$i/$shellRc" ]; then if [ -f "$i/$shellRc" ]; then
sourceFoam="$i/$shellRc" sourceFoam="$i/$shellRc"
break break
fi fi
done done
fi fi
# Construct test string for remote execution. # Construct test string for remote execution.
# Source WM_PROJECT settings if WM_PROJECT environment not set. # Source WM_PROJECT settings if WM_PROJECT environment not set.
# attempt to preserve the installation directory 'FOAM_INST_DIR'
case $sourceFoam in case $sourceFoam in
*/cshrc) sourceFoam='if ( ! $?WM_PROJECT ) source '"$sourceFoam";; */bashrc)
*/bashrc) sourceFoam='[ "$WM_PROJECT" ] || . '"$sourceFoam";; if [ "$FOAM_INST_DIR" ]; then
sourceFoam='[ "$WM_PROJECT" ] || '"FOAM_INST_DIR=$FOAM_INST_DIR . $sourceFoam"
else
sourceFoam='[ "$WM_PROJECT" ] || '". $sourceFoam"
fi
;;
*/cshrc)
# TODO: csh equivalent to bash code (preserving FOAM_INST_DIR)
sourceFoam='if ( ! $?WM_PROJECT ) source '"$sourceFoam"
;;
esac esac
# quote double-quotes for remote command line # quote double-quotes for remote command line
@ -166,7 +177,7 @@ do
# Set colour # Set colour
colour=${colours[$colourIndex]} colour=${colours[$colourIndex]}
#echo "** host=$host colourIndex=$colourIndex colour=$colour" ## echo "** host=$host colourIndex=$colourIndex colour=$colour"
if [ "$host" = "$HOST" ]; then if [ "$host" = "$HOST" ]; then
if [ "$colour" ]; then if [ "$colour" ]; then