diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-18 09:20:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-18 09:42:25 +0200 |
| commit | e7472f43087921c3d83ff4452bbdb67ed27ed604 (patch) | |
| tree | 09565f89d0e5b5a702b532b103fe677c1b13edba /coin/provisioning/qtci-linux-RHEL-6.6-x86_64 | |
| parent | 92d1bdcb43e988919bfdcb91c0e6f366bed07145 (diff) | |
| parent | 12fd0d5b9b486eaf80712d390265402a3bb06f0e (diff) | |
Merge remote-tracking branch 'origin/5.6.3' into 5.6
Conflicts:
.gitmodules
Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c
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 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 |