From b4b62658ac231dbcc17360dcc946117d1be39ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 30 Jan 2018 23:52:33 +0200 Subject: Fix environment variable checking for proxy Change-Id: Iec261d4ce4e84ba656edf9de52b4dc42d0249e51 Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/android_linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/common/linux') diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 76db19d4..a7b83fd7 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -88,7 +88,7 @@ try fi echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." - if [ "$proxy" != "" ]; then + if [ "$http_proxy" != "" ]; then proxy_host=$(echo $proxy | cut -d'/' -f3 | cut -d':' -f1) proxy_port=$(echo $proxy | cut -d':' -f3) echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host=$proxy_host --proxy_port=$proxy_port "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager -- cgit v1.2.3 From c3096caa14393690df2d6bdb79b144924c56f22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 1 Feb 2018 08:32:35 +0200 Subject: Remove excess comment line for shellcheck MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3e9b8091c158a978bd95e48b18df326c3a545798 Reviewed-by: Joni Jäntti Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/cmake_linux.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'coin/provisioning/common/linux') diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 98af57c8..7154d822 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -37,7 +37,6 @@ # CMake is needed for autotests that verify that Qt can be built with CMake -# shellcheck source=InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -- cgit v1.2.3