Move the site configuration up so that WM_THIRD_PARTY_DIR can be unset
before it is set --HG-- branch : bgschaid/minorAdditionsBranch
This commit is contained in:
parent
bcaaa26a75
commit
9bfd822a9b
1 changed files with 6 additions and 6 deletions
12
etc/bashrc
12
etc/bashrc
|
@ -78,12 +78,6 @@ export WM_PROJECT_INST_DIR=$FOAM_INST_DIR
|
|||
export WM_PROJECT_DIR=$WM_PROJECT_INST_DIR/$WM_PROJECT-$WM_PROJECT_VERSION
|
||||
: ${WM_PROJECT_USER_DIR:=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION}; export WM_PROJECT_USER_DIR
|
||||
|
||||
|
||||
# Location of third-party software
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#: ${WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION}; export WM_THIRD_PARTY_DIR
|
||||
: ${WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty}; export WM_THIRD_PARTY_DIR
|
||||
|
||||
# Source files, possibly with some verbosity
|
||||
_foamSource()
|
||||
{
|
||||
|
@ -99,6 +93,12 @@ _foamSource()
|
|||
foamPrefs=`$WM_PROJECT_DIR/bin/foamEtcFile prefs.sh` && _foamSource $foamPrefs
|
||||
unset foamPrefs
|
||||
|
||||
|
||||
# Location of third-party software
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#: ${WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION}; export WM_THIRD_PARTY_DIR
|
||||
: ${WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty}; export WM_THIRD_PARTY_DIR
|
||||
|
||||
# Evaluate command-line parameters
|
||||
while [ $# -gt 0 ]
|
||||
do
|
||||
|
|
Reference in a new issue