Merge remote-tracking branch 'upstream/main' into allow-no-utilities

bmad-sim · Sep 21, 2023 · 8212d84 · 8212d84
2 parents 7a9e906 + 8e91fad
commit 8212d84
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/util/dist_source_me b/util/dist_source_me
@@ -278,6 +278,8 @@ func_set_bmad_env () {
  echo -e "Sourcing User build preferences from util/dist_prefs..." \
  >> ${DIST_SETUP_LOG}
  source ${DIST_BASE_DIR}/util/dist_prefs
+ [[ -n "${BMAD_USER_PREFS}" ]] && [[ -r "${BMAD_USER_PREFS}" ]] && . ${BMAD_USER_PREFS}
+ [[ -r ${DIST_BASE_DIR}/util/user_prefs ]] && . ${DIST_BASE_DIR}/util/user_prefs
 
  echo "Sourcing common build variable set..." \
  >> ${DIST_SETUP_LOG}