From c18f7ca1792eb386b631e51e5ed55de0ac72e0ef Mon Sep 17 00:00:00 2001
From: Junaid Ali <junaidali.yahya@gmail.com>
Date: Sat, 3 Aug 2019 21:21:04 +0100
Subject: [PATCH] Entrypoint script shouldn't check for MONGO_* vars set or
 unset

Also did some code re-alignment for improved readability

Signed-off-by: Junaid Ali <junaidali.yahya@gmail.com>
---
 .docker/entrypoint.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.docker/entrypoint.sh b/.docker/entrypoint.sh
index aecf99f..1701fb6 100644
--- a/.docker/entrypoint.sh
+++ b/.docker/entrypoint.sh
@@ -45,27 +45,27 @@ URL=
 if [ "${MONGO_URL}" == "" ]
 then
     URL=${MONGO_SCHEME}://
-    if [ ! -z ${MONGO_USERNAME+x} ]
+    if [ ! -z ${MONGO_USERNAME} ]
     then
         URL=${URL}${MONGO_USERNAME}
-        if [ ! -z ${MONGO_PASSWORD+x} ]
+        if [ ! -z ${MONGO_PASSWORD} ]
     	then
     	    URL=${URL}:${MONGO_PASSWORD}
     	fi
         URL=${URL}@
     fi
     URL=${URL}${MONGO_ADDRESSES}/${MONGO_DATABASE}
-	if [ -z ${MONGO_TLS+x} ]
-	then
-    	URL="${URL}?ssl=false"
-	else
-	    URL="${URL}?ssl=${MONGO_TLS}"
-	fi
-    if [ ! -z ${MONGO_OPT_PARAMS+x} ]
-	then  
-	    URL="${URL}&${MONGO_OPT_PARAMS}"
-	fi
-	MONGO_URL=${URL}
+    if [ -z ${MONGO_TLS} ]
+    then
+        URL="${URL}?ssl=false"
+    else
+        URL="${URL}?ssl=${MONGO_TLS}"
+    fi
+    if [ ! -z ${MONGO_OPT_PARAMS} ]
+    then
+        URL="${URL}&${MONGO_OPT_PARAMS}"
+    fi
+    MONGO_URL=${URL}
 fi
 
 file_env 'MONGOCLIENT_DEFAULT_CONNECTION_URL'
-- 
GitLab