From 1be180b99f86d11be894960403ae181d24b23f21 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 22 Mar 2017 15:33:51 +0100
Subject: [PATCH] ENH: source 'other' prefs before user/group

- this allows the sys-admin to provide base values independent of any
  WM_PROJECT_SITE value.
---
 etc/bashrc | 8 +++++---
 etc/cshrc  | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/etc/bashrc b/etc/bashrc
index fe4e625c1d..1cf31e7651 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -139,11 +139,13 @@ export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
 # ~~~~~~~~~~~~~~~~~~~~
 . $WM_PROJECT_DIR/etc/config.sh/functions
 
-# Add in preset user or site preferences:
-_foamEtc prefs.sh
+# Override definitions via prefs, with 'other' first so the sys-admin
+# can provide base values independent of WM_PROJECT_SITE
+_foamEtc -mode=o  prefs.sh
+_foamEtc -mode=ug prefs.sh
 
 # Evaluate command-line parameters and record settings for later.
-# These can be used to set/unset values, or specify alternative pref files.
+# These can be used to set/unset values, specify additional files etc.
 export FOAM_SETTINGS="$@"
 _foamEval $@
 
diff --git a/etc/cshrc b/etc/cshrc
index edd5f0043f..9d3fc7e38d 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -152,11 +152,13 @@ else
     alias _foamEtc 'eval `$WM_PROJECT_DIR/bin/foamEtcFile -csh \!*`'
 endif
 
-# Add in preset user or site preferences:
-_foamEtc prefs.csh
+# Override definitions via prefs, with 'other' first so the sys-admin
+# can provide base values independent of WM_PROJECT_SITE
+_foamEtc -mode=o  prefs.csh
+_foamEtc -mode=ug prefs.csh
 
 # Evaluate command-line parameters and record settings for later.
-# These can be used to set/unset values, or specify alternative pref files.
+# These can be used to set/unset values, specify additional files etc.
 setenv FOAM_SETTINGS "${*}"
 while ( $#argv > 0 )
     switch ($argv[1])