From 45ba337ee3ed4eb4f70fdba94b254771aafae250 Mon Sep 17 00:00:00 2001
From: Ray Culbertson <rlc@fnal.gov>
Date: Fri, 28 Jul 2023 20:48:37 -0500
Subject: [PATCH] two new features for KinKal

---
 bin/museBuild.sh | 22 ++++++++++++++++++++++
 bin/museSetup.sh | 10 ++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/bin/museBuild.sh b/bin/museBuild.sh
index 3cd2118..7633dd8 100755
--- a/bin/museBuild.sh
+++ b/bin/museBuild.sh
@@ -53,6 +53,28 @@ do
     mkdir -p $MUSE_BUILD_DIR/$REPO
 done
 
+#
+# if the user set some scripts to run before building
+#
+if [ "$MUSE_PRESOURCE" ]; then
+    echo "Muse presource: $MUSE_PRESOURCE"
+    source $MUSE_PRESOURCE
+    RC=$?
+    if [ $RC -ne 0 ]; then
+        echo "ERROR - MUSE_PRESOURCE returns $RC"
+        exit $RC
+    fi
+fi
+if [ "$MUSE_PREBUILD" ]; then
+    echo "Muse prebuild: $MUSE_PREBUILD"
+    $MUSE_PREBUILD
+    RC=$?
+    if [ $RC -ne 0 ]; then
+        echo "ERROR - MUSE_PREBUILD returns $RC"
+        exit $RC
+    fi
+fi
+
 #
 # now run the local build
 #
diff --git a/bin/museSetup.sh b/bin/museSetup.sh
index ea8f960..3fc4980 100755
--- a/bin/museSetup.sh
+++ b/bin/museSetup.sh
@@ -110,7 +110,7 @@ QFOUND=""
 for ARG in "$@"
 do
     if [ "$QFOUND" == "true" ]; then
-        MUSE_QUALS="$MUSE_QUALS $ARG"
+        [ "$ARG" != "-q" ] && MUSE_QUALS="$MUSE_QUALS $ARG"
     elif [ "$ARG" == "-q" ]; then
         QFOUND="true"
     elif [[  "$ARG" == "-h" || "$ARG" == "--help" || "$ARG" == "help" ]]; then
@@ -305,6 +305,13 @@ if [ $MUSE_VERBOSE -gt 0 ]; then
     done
 fi
 
+#
+# include local UPS products
+#
+if [ -d $MUSE_WORK_DIR/artexternals ]; then
+    echo "INFO - Adding \$MUSE_WORK_DIR/artexternals to UPS PRODUCTS path"
+    export PRODUCTS=$MUSE_WORK_DIR/artexternals:$PRODUCTS
+fi
 
 #
 # figure out what environmental UPS setups to run
@@ -403,7 +410,6 @@ if [ -z "$MUSE_ENVSET"  ]; then
     return 1
 fi
 
-
 if [ $MUSE_VERBOSE -gt 0 ]; then
     echo "INFO - running environmental set $MUSE_ENVSET "
 fi