From 5712450bd083c94384bb5281244e896139945a17 Mon Sep 17 00:00:00 2001
From: Ben Bodenmiller <bbodenmiller@hotmail.com>
Date: Wed, 17 Aug 2016 00:04:54 -0700
Subject: [PATCH] improve proxy variables check

Signed-off-by: Ben Bodenmiller <bbodenmiller@hotmail.com>
---
 .../Contents/Resources/Scripts/start.sh            | 14 +++++++-------
 windows/start.sh                                   | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh b/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh
index 7c55d992f1..398afc85ec 100755
--- a/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh
+++ b/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh
@@ -30,15 +30,15 @@ if [ $VM_EXISTS_CODE -eq 1 ]; then
   "${DOCKER_MACHINE}" rm -f "${VM}" &> /dev/null
   rm -rf ~/.docker/machine/machines/"${VM}"
   #set proxy variables if they exists
-  if [ -n ${HTTP_PROXY+x} ]; then
-	PROXY_ENV="$PROXY_ENV --engine-env HTTP_PROXY=$HTTP_PROXY"
+  if [ "${HTTP_PROXY}" ]; then
+    PROXY_ENV="$PROXY_ENV --engine-env HTTP_PROXY=$HTTP_PROXY"
   fi
-  if [ -n ${HTTPS_PROXY+x} ]; then
-	PROXY_ENV="$PROXY_ENV --engine-env HTTPS_PROXY=$HTTPS_PROXY"
+  if [ "${HTTPS_PROXY}" ]; then
+    PROXY_ENV="$PROXY_ENV --engine-env HTTPS_PROXY=$HTTPS_PROXY"
+  fi
+  if [ "${NO_PROXY}" ]; then
+    PROXY_ENV="$PROXY_ENV --engine-env NO_PROXY=$NO_PROXY"
   fi
-  if [ -n ${NO_PROXY+x} ]; then
-	PROXY_ENV="$PROXY_ENV --engine-env NO_PROXY=$NO_PROXY"
-  fi  
   "${DOCKER_MACHINE}" create -d virtualbox $PROXY_ENV --virtualbox-memory 2048 --virtualbox-disk-size 204800 "${VM}"
 fi
 
diff --git a/windows/start.sh b/windows/start.sh
index dc94114e28..6594ec829e 100644
--- a/windows/start.sh
+++ b/windows/start.sh
@@ -41,15 +41,15 @@ if [ $VM_EXISTS_CODE -eq 1 ]; then
   "${DOCKER_MACHINE}" rm -f "${VM}" &> /dev/null || :
   rm -rf ~/.docker/machine/machines/"${VM}"
   #set proxy variables if they exists
-  if [ -n ${HTTP_PROXY+x} ]; then
-	PROXY_ENV="$PROXY_ENV --engine-env HTTP_PROXY=$HTTP_PROXY"
+  if [ "${HTTP_PROXY}" ]; then
+    PROXY_ENV="$PROXY_ENV --engine-env HTTP_PROXY=$HTTP_PROXY"
   fi
-  if [ -n ${HTTPS_PROXY+x} ]; then
-	PROXY_ENV="$PROXY_ENV --engine-env HTTPS_PROXY=$HTTPS_PROXY"
+  if [ "${HTTPS_PROXY}" ]; then
+    PROXY_ENV="$PROXY_ENV --engine-env HTTPS_PROXY=$HTTPS_PROXY"
+  fi
+  if [ "${NO_PROXY}" ]; then
+    PROXY_ENV="$PROXY_ENV --engine-env NO_PROXY=$NO_PROXY"
   fi
-  if [ -n ${NO_PROXY+x} ]; then
-	PROXY_ENV="$PROXY_ENV --engine-env NO_PROXY=$NO_PROXY"
-  fi  
   "${DOCKER_MACHINE}" create -d virtualbox $PROXY_ENV "${VM}"
 fi