From 9bfd822a9b183f2000a9907ce26d7ce29ba33b19 Mon Sep 17 00:00:00 2001 From: "Bernhard F.W. Gschaider" Date: Thu, 11 Jul 2013 18:21:35 +0200 Subject: [PATCH] Move the site configuration up so that WM_THIRD_PARTY_DIR can be unset before it is set --HG-- branch : bgschaid/minorAdditionsBranch --- etc/bashrc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/bashrc b/etc/bashrc index 7298cd29a..70f6f6ee8 100644 --- a/etc/bashrc +++ b/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