summaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2018-03-08 13:41:36 +0200
committerTony Sarajärvi <tony.sarajarvi@qt.io>2018-03-19 11:56:53 +0000
commit1c6abfae014b3ece4d14d3dc7b9a22353cf18c66 (patch)
tree6b2c77803325a53b882b7734f9da788de12b1ec7 /coin
parent4492fd3268e575dc79d77105821839631aac998f (diff)
Remove try_catch from common linux scripts
Change-Id: I9c7b472fa4c448f40c9adc6cc8a0d84cb9c5e74c Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin')
-rwxr-xr-xcoin/provisioning/common/linux/android_linux.sh107
1 files changed, 34 insertions, 73 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh
index a7b83fd7..696f7d29 100755
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -37,7 +37,6 @@
# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
-source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
@@ -62,75 +61,37 @@ toolsSourceFile="$basePath/$toolsFile"
ndkTargetFile="/tmp/$ndkFile"
ndkSourceFile="$basePath/$ndkFile"
-ExceptionDownload=99
-ExceptionUnzipTools=100
-ExceptionUnzipNdk=101
-ExceptionRmTools=102
-ExceptionRmNdk=103
-ExceptionSdkManager=104
-
-try
-(
- (DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile") || throw $ExceptionDownload
- (DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile") || throw $ExceptionDownload
- echo "Unzipping Android NDK to '$targetFolder'"
- sudo unzip -q "$ndkTargetFile" -d "$targetFolder" || throw $ExceptionUnzipNdk
- echo "Unzipping Android Tools to '$sdkTargetFolder'"
- sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder" || throw $ExceptionUnzipTools
- rm "$ndkTargetFile" || throw $ExceptionRmNdk
- rm "$toolsTargetFile" || throw $ExceptionRmTools
-
- echo "Changing ownership of Android files."
- if uname -a |grep -q "el6\|el7"; then
- sudo chown -R qt:wheel "$targetFolder"
- else
- sudo chown -R qt:users "$targetFolder"
- fi
-
- echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
- 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
- else
- echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
- fi
-
- SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
- SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
- SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
- SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
-
- echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
- echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
- echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
- echo "Android NDK = $ndkVersion" >> ~/versions.txt
-)
-catch || {
- case $ex_code in
- $ExceptionDownload)
- exit 1;
- ;;
- $ExceptionUnzipTools)
- echo "Failed to unzip Android SDK Tools."
- exit 1;
- ;;
- $ExceptionUnzipNdk)
- echo "Failed to unzip Android NDK."
- exit 1;
- ;;
- $ExceptionRmTools)
- echo "Failed to remove temporary tools package '$toolsTargetFile'."
- exit 1;
- ;;
- $ExceptionRmNdk)
- echo "Failed to remove temporary NDK package '$ndkTargetFile'."
- exit 1;
- ;;
- $ExceptionSdkManager)
- echo "Failed to run sdkmanager."
- exit 1;
- ;;
- esac
-}
-
+DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile"
+DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
+echo "Unzipping Android NDK to '$targetFolder'"
+sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
+echo "Unzipping Android Tools to '$sdkTargetFolder'"
+sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder"
+rm "$ndkTargetFile"
+rm "$toolsTargetFile"
+
+echo "Changing ownership of Android files."
+if uname -a |grep -q "el6\|el7"; then
+ sudo chown -R qt:wheel "$targetFolder"
+else
+ sudo chown -R qt:users "$targetFolder"
+fi
+
+echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
+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"
+else
+ echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
+fi
+
+SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
+SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
+SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
+SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
+
+echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
+echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
+echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
+echo "Android NDK = $ndkVersion" >> ~/versions.txt