diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2017-09-15 10:26:29 +0300 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-09-15 10:38:24 +0000 |
commit | 12fd0d5b9b486eaf80712d390265402a3bb06f0e (patch) | |
tree | 42c3257bcf958e5af7d6b606961053648cd75a46 | |
parent | b0a9259c6ee24673fc5579ba33063e9a7619a3d2 (diff) | |
download | qt5-12fd0d5b9b486eaf80712d390265402a3bb06f0e.tar.gz |
Remove old android installation and make sure new 'clean' android
folder is created.
Change-Id: I4c561797791e08976b07a194c2c9ed2f5aa302bb
Reviewed-by: Simo Fält <simo.falt@qt.io>
-rw-r--r-- | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh index 7c3220ee..c278a2ce 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh @@ -87,7 +87,13 @@ function InstallAndroidPackage { sudo rm -fr "$targetFolder"/"$version" } -sudo mkdir "$targetFolder" +if [ -d "$targetFolder" ]; then + echo "Removing old Android installation" + sudo rm -fr "$targetFolder" || ( echo "Can't remove $targetFolder" ; exit 1; ) +fi + +sudo mkdir "$targetFolder" || ( echo "Can't create $targetFolder" ; exit 1; ) + # Install Android SDK echo "Installing Android SDK version $sdkPackage..." InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName |