From 62b8cabb31bb6019f0a74a04b24538201b374ebb Mon Sep 17 00:00:00 2001
From: Martin Lablans <m.lablans@dkfz-heidelberg.de>
Date: Thu, 3 Nov 2022 18:14:11 +0100
Subject: [PATCH] Fix getting LDM_LOGIN

---
 bridgehead       | 4 +---
 lib/functions.sh | 7 ++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/bridgehead b/bridgehead
index fc454fd..68e8933 100755
--- a/bridgehead
+++ b/bridgehead
@@ -65,9 +65,7 @@ case "$ACTION" in
 		hc_send log "Bridgehead $PROJECT startup: Checking requirements ..."
 		checkRequirements
 		hc_send log "Bridgehead $PROJECT startup: Requirements checked out. Now starting bridgehead ..."
-		set -a
-		setLdmPassword
-		set +a
+		export LDM_LOGIN=$(getLdmPassword)
 		exec $COMPOSE -f ./$PROJECT/docker-compose.yml $OVERRIDE up --abort-on-container-exit
 		;;
 	stop)
diff --git a/lib/functions.sh b/lib/functions.sh
index 0a0ab0a..6c81d7b 100755
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -11,10 +11,11 @@ detectCompose() {
 	fi
 }
 
-setLdmPassword() {
+getLdmPassword() {
 	if [ -n "$LDM_PASSWORD" ]; then
-		log DEBUG "Transforming LDM_PASSWORD into LDM_LOGIN ..."
-		export LDM_LOGIN=$(docker run --rm -it httpd:alpine htpasswd -nb $PROJECT $LDM_PASSWORD | tr -d '\n' | tr -d '\r')
+		docker run --rm httpd:alpine htpasswd -nb $PROJECT $LDM_PASSWORD | tr -d '\n' | tr -d '\r'
+	else
+		echo -n ""
 	fi
 }