lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix shellcheck complaints for RHEL 7.x in provisioning scripts

Browse Source 
Change-Id: I489f4f25d603457c8f0444ed277a162a7fd4128f
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Tony Sarajärvi
2018-04-11 10:22:32 +03:00
committed by Liang Qi
parent 7a018aeb8b
commit 889cdbf4a8
14 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh
View File

@@ -36,7 +36,8 @@
set -ex
BASEDIR=$(dirname "$0")
source $BASEDIR/../common/shared/network_test_server_ip.txt
# shellcheck source=../common/shared/network_test_server_ip.txt
source "$BASEDIR/../common/shared/network_test_server_ip.txt"
echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts

1
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh
View File

@@ -35,6 +35,7 @@
set -ex
# shellcheck source=../common/unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
package="epel-release-7-11.noarch.rpm"

5
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh
View File

@@ -2,9 +2,10 @@
set -ex
BASEDIR=$(dirname "$0")
. $BASEDIR/../common/shared/sw_versions.txt
# shellcheck source=../common/shared/sw_versions.txt
. "$BASEDIR/../common/shared/sw_versions.txt"
VERSION=$libclang_version
URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"
"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION"

1
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh
View File

@@ -39,4 +39,5 @@ set -ex
# CMake is needed for autotests that verify that Qt can be built with CMake
# shellcheck source=../common/linux/cmake_linux.sh
source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh"

1
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh
View File

@@ -35,4 +35,5 @@
set -ex
# shellcheck source=../common/linux/qnx_700.sh
source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"

1
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh
View File

@@ -35,4 +35,5 @@
set -ex
# shellcheck source=../common/linux/integrity.sh
source "${BASH_SOURCE%/*}/../common/linux/integrity.sh"

1
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh
View File

@@ -35,4 +35,5 @@
set -ex
# shellcheck source=../common/linux/disable_selinux.sh
source "${BASH_SOURCE%/*}/../common/linux/disable_selinux.sh"

2
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh
View File

@@ -34,8 +34,10 @@
#############################################################################
set +e
# shellcheck disable=SC1091
source /opt/rh/devtoolset-4/enable
set -ex
# shellcheck source=../common/linux/openssl_for_android_linux.sh
source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh"

1
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh
View File

@@ -33,4 +33,5 @@
##
#############################################################################
# shellcheck source=../common/unix/mqtt_broker.sh
source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"

2
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh
View File

@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
$BASEDIR/../common/linux/fbx_linux.sh
"$BASEDIR/../common/linux/fbx_linux.sh"

24
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh
View File

@@ -47,26 +47,26 @@ develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/
echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
targetFile=`mktemp`
wget --tries=5 --waitretry=5 --output-document=$targetFile $baseBinaryPackageURL
targetFile=$(mktemp)
wget --tries=5 --waitretry=5 --output-document="$targetFile" "$baseBinaryPackageURL"
echo "$sha1 $targetFile" | sha1sum --check
sudo 7z x -y -o"/usr/lib64" $targetFile
sudo rm $targetFile
sudo 7z x -y -o/usr/lib64 "$targetFile"
sudo rm "$targetFile"
echo "Installing custom ICU devel packages on RHEL"
tempDir=`mktemp -d`
tempDir=$(mktemp -d)
targetFile=`mktemp`
wget --tries=5 --waitretry=5 --output-document=$targetFile $develPackageURL
targetFile=$(mktemp)
wget --tries=5 --waitretry=5 --output-document="$targetFile" "$develPackageURL"
echo "$sha1Dev $targetFile" | sha1sum --check
7z x -y -o$tempDir $targetFile
7z x -y -o"$tempDir" "$targetFile"
sudo cp -a $tempDir/lib/* /usr/lib64
sudo cp -a $tempDir/* /usr/
sudo cp -a "$tempDir"/lib/* /usr/lib64
sudo cp -a "$tempDir"/* /usr/
sudo rm $targetFile
sudo rm -fr $tempDir
sudo rm "$targetFile"
sudo rm -fr "$tempDir"
sudo /sbin/ldconfig

1
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh
View File

@@ -35,4 +35,5 @@
set -ex
# shellcheck source=../common/linux/android_linux.sh
source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh"

1
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh
View File

@@ -33,4 +33,5 @@
##
#############################################################################
# shellcheck source=../common/linux/open62541.sh
source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"

2
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash
BASEDIR=$(dirname "$0")
$BASEDIR/../common/unix/squishInstall.sh
"$BASEDIR/../common/unix/squishInstall.sh"