From 895536880f7532b89751803ae2881111fe41085d Mon Sep 17 00:00:00 2001 From: Ben Bodenmiller Date: Wed, 17 Aug 2016 00:14:44 -0700 Subject: [PATCH] clear all_proxy if not socks address Signed-off-by: Ben Bodenmiller --- .../quickstart.app/Contents/Resources/Scripts/start.sh | 8 ++++++++ windows/start.sh | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh b/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh index 7c55d992f1..ce9aee4672 100755 --- a/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh +++ b/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh @@ -11,6 +11,14 @@ NC='\033[0m' unset DYLD_LIBRARY_PATH unset LD_LIBRARY_PATH +#clear all_proxy if not socks address +if [[ $ALL_PROXY != socks* ]]; then + unset ALL_PROXY +fi +if [[ $all_proxy != socks* ]]; then + unset all_proxy +fi + clear if [ ! -f "${DOCKER_MACHINE}" ]; then diff --git a/windows/start.sh b/windows/start.sh index dc94114e28..1c5ee17cab 100644 --- a/windows/start.sh +++ b/windows/start.sh @@ -20,6 +20,13 @@ BLUE='\033[1;34m' GREEN='\033[0;32m' NC='\033[0m' +#clear all_proxy if not socks address +if [[ $ALL_PROXY != socks* ]]; then + unset ALL_PROXY +fi +if [[ $all_proxy != socks* ]]; then + unset all_proxy +fi if [ ! -f "${DOCKER_MACHINE}" ]; then echo "Docker Machine is not installed. Please re-run the Toolbox Installer and try again."