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

STYLE: foamVersion alias should not change directory (closes #1131)

Browse Source
This commit is contained in:
Mark Olesen
2018-12-19 07:54:35 +01:00
parent b0eeea8365
commit 4c14bc66ef
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
etc/config.csh/aliases
View File

@ -60,10 +60,11 @@ alias uutil 'cd $WM_PROJECT_USER_DIR/applications/utilities'
alias wmRefresh 'set projectDir=$WM_PROJECT_DIR; set foamSettings=$FOAM_SETTINGS; wmUnset; source $projectDir/etc/cshrc $foamSettings' alias wmRefresh 'set projectDir=$WM_PROJECT_DIR; set foamSettings=$FOAM_SETTINGS; wmUnset; source $projectDir/etc/cshrc $foamSettings'
# Change OpenFOAM version # Query the current OpenFOAM version
# ~~~~~~~~~~~~~~~~~~~~~~~ # or change to another version (if installed in a parallel directory)
# - can be fragile
alias foamVersion \ alias foamVersion \
'if ( "\!*" != "" ) source ${WM_PROJECT_DIR:h}/OpenFOAM-\!*/etc/cshrc; foam; echo OpenFOAM-$WM_PROJECT_VERSION' 'if ( "\!*" != "" ) source ${WM_PROJECT_DIR:h}/OpenFOAM-\!*/etc/cshrc; echo OpenFOAM-$WM_PROJECT_VERSION'
# Change ParaView version # Change ParaView version

17
etc/config.sh/aliases
View File

@ -60,7 +60,7 @@ wmRefresh()
{ {
local projectDir="$WM_PROJECT_DIR" local projectDir="$WM_PROJECT_DIR"
local foamSettings="$FOAM_SETTINGS" local foamSettings="$FOAM_SETTINGS"
wmUnset . "$projectDir/etc/config.sh/unset" 2>/dev/null
. "$projectDir/etc/bashrc" "$foamSettings" . "$projectDir/etc/bashrc" "$foamSettings"
} }
@ -70,20 +70,19 @@ wmRefresh()
unset -f foamVersion 2>/dev/null unset -f foamVersion 2>/dev/null
foamVersion() foamVersion()
{ {
if [ "$#" -gt 0 ] if [ "$#" -gt 0 ] && [ -d "$WM_PROJECT_DIR" ]
then then
local dir="${WM_PROJECT_DIR%/*}" # Parent directory local prefixDir="${WM_PROJECT_DIR%/*}" # Parent directory
local ver="$1" local ver="$1"
shift shift
if [ -f "$dir/OpenFOAM-$ver/etc/bashrc" ] if [ -f "$prefixDir/OpenFOAM-$ver/etc/bashrc" ]
then then
wmUnset . "$WM_PROJECT_DIR/etc/config.sh/unset" 2>/dev/null
. "$dir/OpenFOAM-$ver/etc/bashrc" . "$prefixDir/OpenFOAM-$ver/etc/bashrc"
foam echo "Using OpenFOAM-$WM_PROJECT_VERSION" 1>&2
echo "Changed to OpenFOAM-$WM_PROJECT_VERSION" 1>&2
else else
echo "No OpenFOAM-$ver available in $dir" 1>&2 echo "No OpenFOAM-$ver available in $prefixDir" 1>&2
echo "Using OpenFOAM-$WM_PROJECT_VERSION" 1>&2 echo "Using OpenFOAM-$WM_PROJECT_VERSION" 1>&2
return 1 return 1
fi fi