BUG: prefs.sh was sourced in the wrong position in etc/{bashrc,cshrc}

This commit is contained in:
Mark Olesen
2010-03-15 15:15:38 +01:00
parent ee199b9e9a
commit 7308242498
4 changed files with 71 additions and 87 deletions

View File

@ -35,7 +35,7 @@
#------------------------------------------------------------------------------
# clean the PATH
cleanedEnv=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-"` && PATH="$cleanedEnv"
cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-"` && PATH="$cleaned"
# determine the cmake to be used
unset CMAKE_HOME
@ -92,5 +92,5 @@ else
fi
unset cleanedEnv cmake paraviewInstDir paraviewPython
unset cleaned cmake paraviewInstDir paraviewPython
# -----------------------------------------------------------------------------

View File

@ -35,8 +35,8 @@
#------------------------------------------------------------------------------
# clean the PATH
set cleanedEnv=`$WM_PROJECT_DIR/bin/foamCleanPath -space "$path" "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-"`
if ( $status == 0 ) set path=($cleanedEnv)
set cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath -space "$path" "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-"`
if ( $status == 0 ) set path=($cleaned)
# determine the cmake to be used
unsetenv CMAKE_HOME
@ -89,5 +89,5 @@ else
endif
unset cleanedEnv cmake paraviewInstDir paraviewPython
unset cleaned cmake paraviewInstDir paraviewPython
# -----------------------------------------------------------------------------