From 12fd0d5b9b486eaf80712d390265402a3bb06f0e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 15 Sep 2017 10:26:29 +0300 Subject: Ensure 'clean' android Installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove old android installation and make sure new 'clean' android folder is created. Change-Id: I4c561797791e08976b07a194c2c9ed2f5aa302bb Reviewed-by: Simo Fält --- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3