lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-24 13:47:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Remove logical OR when echo errors

Browse Source 
set -e won't work if logical OR is used after commands. These error
echo's need to be removed so that error catch will works. Also set -ex
added to print executed command when error caught.

Task-number: QTQAINFRA-1533
Change-Id: Ib4ea832a0ee813f99f59ebacad51ec57c3eff57d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
Heikki Halmet
2017-11-03 13:09:55 +02:00
committed by Tony Sarajärvi
parent 894c63834b
commit 0e278c4e95
6 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
View File

@@ -43,7 +43,7 @@
# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device.
# That's why we need to use Andoid-21 API version in Qt 5.9.
set -e
set -ex
targetFolder="/opt/android"
baseUrl="http://ci-files01-hki.intra.qt.io/input/android"
@@ -78,8 +78,8 @@ function InstallAndroidPackage {
folderName=$7
name=$8
sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" || echo "Failed to download '$url' multiple times"
echo "$sha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url"
echo "$sha1 $targetFile" | sha1sum --check
sudo chmod 755 "$targetFile"
sudo $extract || echo "Failed to extract $url"
sudo chown -R qt:users "$targetFolder"/"$folderName"
@@ -89,10 +89,10 @@ function InstallAndroidPackage {
if [ -d "$targetFolder" ]; then
echo "Removing old Android installation"
sudo rm -fr "$targetFolder" || ( echo "Can't remove $targetFolder" ; exit 1; )
sudo rm -fr "$targetFolder"
fi
sudo mkdir "$targetFolder" || ( echo "Can't create $targetFolder" ; exit 1; )
sudo mkdir "$targetFolder"
# Install Android SDK
echo "Installing Android SDK version $sdkPackage..."
@@ -104,7 +104,7 @@ InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFil
# run update for Android SDK and install SDK API version 21, latest SDK tools, platform-tools and build-tools
echo "Running Android SDK update for API version 21, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..."
echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update"
echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion
echo 'export ANDROID_API_VERSION=android-21' >> ~/.bashrc