diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-25 08:57:06 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-25 08:57:06 +0200 |
| commit | 892b1977c586c2364f54866115a665df2193d6e8 (patch) | |
| tree | 931adafe9b4117463b2b0c52feaa25e4c18a2a40 /coin/provisioning/qtci-linux-RHEL-6.6-x86_64 | |
| parent | 90ddfaf35f293e0ec6f27f78b9a50509b24066f8 (diff) | |
| parent | 51c26733040d94cb62b6f1d2df32da7ebe80d842 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I623539ff0e95642bdd58fa3bbac4d1c88afbe519
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64')
| -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 37b8c4be..fb8679f2 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 |