From ada1d7b594bbe7247773fbcd5fde7f75284b86c3 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dkalinkin@bnl.gov>
Date: Thu, 23 May 2024 22:52:08 +0000
Subject: [PATCH] env.sh: handle DETECTOR_VERSION as it currently comes from
the spack package
---
bin/env.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/bin/env.sh b/bin/env.sh
index d25eb06..0588937 100755
--- a/bin/env.sh
+++ b/bin/env.sh
@@ -47,9 +47,12 @@ fi
# export DETECTOR_CONFIG="${DETECTOR}_full"
#fi
-# main is the new master
if [ ! -n "${DETECTOR_VERSION}" ] ; then
export DETECTOR_VERSION="main"
+else
+ # handle spack version spec format (e.g. git.fcf90937193c983c0af2acf1251e01f2e2c3a259=main)
+ DETECTOR_VERSION=${DETECTOR_VERSION##git.}
+ export DETECTOR_VERSION=${DETECTOR_VERSION%%=*}
fi
if [ ! -n "${DETECTOR_REPOSITORYURL}" ] ; then
--
GitLab