From 95cc9f919863bc75e1ba21d7307f9708a5426e8c Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 4 Aug 2023 18:32:32 -0500 Subject: [PATCH] fix: rm unused env vars in setup.sh (#489) For a year now, we have not used the environment variables prefixed with `JUGGLER_`, and for over 9 months we have not used the `BEAMLINE_` variables. This finally removes them from the setup script. --- templates/setup.sh.in | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/templates/setup.sh.in b/templates/setup.sh.in index 1dcb89802..db18dc212 100644 --- a/templates/setup.sh.in +++ b/templates/setup.sh.in @@ -5,22 +5,6 @@ export DETECTOR_PATH=@CMAKE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@ export DETECTOR_CONFIG=@PROJECT_NAME@ export DETECTOR_VERSION=@GIT_BRANCH@ -export BEAMLINE=@PROJECT_NAME@ -export BEAMLINE_PATH=@CMAKE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@ -export BEAMLINE_CONFIG=@PROJECT_NAME@ -export BEAMLINE_VERSION=@GIT_BRANCH@ - -## note: we will phase out the JUGGLER_* flavor of variables in the future -export JUGGLER_DETECTOR=$DETECTOR -export JUGGLER_DETECTOR_CONFIG=$DETECTOR_CONFIG -export JUGGLER_DETECTOR_VERSION=$DETECTOR_VERSION -export JUGGLER_DETECTOR_PATH=$DETECTOR_PATH - -export JUGGLER_BEAMLINE=$BEAMLINE -export JUGGLER_BEAMLINE_CONFIG=$BEAMLINE_CONFIG -export JUGGLER_BEAMLINE_VERSION=$BEAMLINE_VERSION -export JUGGLER_BEAMLINE_PATH=$BEAMLINE_PATH - ## Export detector libraries if [[ "$(uname -s)" = "Darwin" ]] || [[ "$OSTYPE" == "darwin"* ]]; then export DYLD_LIBRARY_PATH="@CMAKE_INSTALL_FULL_LIBDIR@${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}"