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 in RHEL 6.6 provisioning scripts

Browse Source 
Change-Id: Idb4240b4cfd309b2c6c418e8c18b175a491f8eea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This commit is contained in:
Tony Sarajärvi
2018-04-11 10:12:09 +03:00
committed by Liang Qi
parent 6df84f8984
commit cd347c86af
8 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh
View File

@@ -35,8 +35,10 @@
set -ex
# shellcheck source=../common/unix/check_and_set_proxy.sh
source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
# shellcheck disable=SC2031
if [ "$http_proxy" != "" ]; then
echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
fi

1
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh
View File

@@ -1,3 +1,4 @@
#!/usr/bin/env bash
# shellcheck source=../common/linux/disable-ntp_linux.sh
source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh"

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

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

5
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh
View File

@@ -3,9 +3,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-Rhel6.6-gcc4.9-x86_64.7z"
SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952"
$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"
"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION"

2
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash
set -ex
$(dirname $0)/../common/linux/cmake_linux.sh
"$(dirname "$0")/../common/linux/cmake_linux.sh"

1
coin/provisioning/qtci-linux-RHEL-6.6-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"

19
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
View File

@@ -45,27 +45,28 @@ function Install7ZPackageFromURL {
expectedSha1=$2
targetDirectory=$3
targetFile=`mktemp`
wget --tries=5 --waitretry=5 --output-document=$targetFile $url
targetFile=$(mktemp)
wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url"
echo "$expectedSha1 $targetFile" | sha1sum --check
sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile
rm $targetFile
sudo /usr/local/bin/7z x -yo"$targetDirectory" "$targetFile"
rm "$targetFile"
}
echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z"
Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64"
Install7ZPackageFromURL "$baseBinaryPackageURL" "$sha1" "/usr/lib64"
echo "Installing custom ICU devel packages on RHEL"
sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df"
develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z"
tempDir=`mktemp -d`
tempDir=$(mktemp -d)
# shellcheck disable=SC2064
trap "sudo rm -fr $tempDir" EXIT
Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir
sudo cp -a $tempDir/lib/* /usr/lib64
sudo cp -a $tempDir/* /usr/
Install7ZPackageFromURL "$develPackageURL" "$sha1Dev" "$tempDir"
sudo cp -a "$tempDir/lib"/* /usr/lib64
sudo cp -a "$tempDir"/* /usr/
sudo /sbin/ldconfig

3
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh
View File

@@ -39,9 +39,10 @@
set -ex
# shellcheck disable=SC2129
echo "*********************************************" >> ~/versions.txt
echo "***** All installed RPM packages *****" >> ~/versions.txt
rpm -q -a | sort >> ~/versions.txt
echo "*********************************************" >> ~/versions.txt
$(dirname $0)/../common/linux/version.sh
"$(dirname "$0")/../common/linux/version.sh"