From 5ba1a1a82029e1156e78cd3baad8ad08fe17276a Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Tue, 9 Jan 2024 11:43:57 +0100 Subject: [PATCH] Fix variable visibility --- bbmri/modules/eric-setup.sh | 12 ++++++------ bbmri/modules/gbn-setup.sh | 12 ++++++------ bridgehead | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/bbmri/modules/eric-setup.sh b/bbmri/modules/eric-setup.sh index fc689e8..d2f36bb 100644 --- a/bbmri/modules/eric-setup.sh +++ b/bbmri/modules/eric-setup.sh @@ -7,17 +7,17 @@ if [ "${ENABLE_ERIC}" == "true" ]; then # The environment needs to be defined in /etc/bridgehead case "$ENVIRONMENT" in "production") - ERIC_BROKER_ID=broker.bbmri.samply.de - ERIC_ROOT_CERT=eric + export ERIC_BROKER_ID=broker.bbmri.samply.de + export ERIC_ROOT_CERT=eric ;; "test") - ERIC_BROKER_ID=broker-test.bbmri-test.samply.de - ERIC_ROOT_CERT=eric.test + export ERIC_BROKER_ID=broker-test.bbmri-test.samply.de + export ERIC_ROOT_CERT=eric.test ;; *) report_error 6 "Environment \"$ENVIRONMENT\" is unknown. Assuming production. FIX THIS!" - ERIC_BROKER_ID=broker.bbmri.samply.de - ERIC_ROOT_CERT=eric + export ERIC_BROKER_ID=broker.bbmri.samply.de + export ERIC_ROOT_CERT=eric ;; esac diff --git a/bbmri/modules/gbn-setup.sh b/bbmri/modules/gbn-setup.sh index b09c208..5ab1325 100644 --- a/bbmri/modules/gbn-setup.sh +++ b/bbmri/modules/gbn-setup.sh @@ -7,17 +7,17 @@ if [ "${ENABLE_GBN}" == "true" ]; then # The environment needs to be defined in /etc/bridgehead case "$ENVIRONMENT" in "production") - GBN_BROKER_ID=broker.bbmri.de - GBN_ROOT_CERT=gbn + export GBN_BROKER_ID=broker.bbmri.de + export GBN_ROOT_CERT=gbn ;; "test") - GBN_BROKER_ID=broker.test.bbmri.de - GBN_ROOT_CERT=gbn.test + export GBN_BROKER_ID=broker.test.bbmri.de + export GBN_ROOT_CERT=gbn.test ;; *) report_error 6 "Environment \"$ENVIRONMENT\" is unknown. Assuming production. FIX THIS!" - GBN_BROKER_ID=broker.bbmri.de - GBN_ROOT_CERT=gbn + export GBN_BROKER_ID=broker.bbmri.de + export GBN_ROOT_CERT=gbn ;; esac diff --git a/bridgehead b/bridgehead index 8231792..8922174 100755 --- a/bridgehead +++ b/bridgehead @@ -72,14 +72,14 @@ loadVars() { case "$ENVIRONMENT" in "production") - FOCUS_TAG=main + export FOCUS_TAG=main ;; "test") - FOCUS_TAG=develop + export FOCUS_TAG=develop ;; *) report_error 7 "Environment \"$ENVIRONMENT\" is unknown. Assuming production. FIX THIS!" - FOCUS_TAG=main + export FOCUS_TAG=main ;; esac }