aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-linux-RHEL-7.4-x86_64
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2018-04-11 10:22:32 +0300
committerLiang Qi <liang.qi@qt.io>2018-04-29 16:12:00 +0000
commit889cdbf4a8f90e7580f55d341006f49f12f9b9c7 (patch)
treebd6432e38bf5e53cab3b4984f5944a72f8d761e1 /coin/provisioning/qtci-linux-RHEL-7.4-x86_64
parent7a018aeb8b0fe63d0370cc2f704d40fdf3e30bfc (diff)
Fix shellcheck complaints for RHEL 7.x in provisioning scripts
Change-Id: I489f4f25d603457c8f0444ed277a162a7fd4128f Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-7.4-x86_64')
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh3
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh5
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh24
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh2
14 files changed, 29 insertions, 17 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh
index 85ceaa24..c0f94a49 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh
@@ -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
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh
index 4eb9882d..5cdf7df0 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-rhel-epel.sh
@@ -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"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh
index 49d4d4f5..219f80c4 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh
@@ -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"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh
index 9800229d..062b2790 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh
@@ -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"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh
index 970d80b1..92c741fb 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh
@@ -35,4 +35,5 @@
set -ex
+# shellcheck source=../common/linux/qnx_700.sh
source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh
index 1710b878..154370da 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh
@@ -35,4 +35,5 @@
set -ex
+# shellcheck source=../common/linux/integrity.sh
source "${BASH_SOURCE%/*}/../common/linux/integrity.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh
index e4d2dc15..b7a53cd4 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh
@@ -35,4 +35,5 @@
set -ex
+# shellcheck source=../common/linux/disable_selinux.sh
source "${BASH_SOURCE%/*}/../common/linux/disable_selinux.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh
index 9b0cd0f6..ef2b3ba8 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh
@@ -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"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh
index 04c09770..505374c5 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh
@@ -33,4 +33,5 @@
##
#############################################################################
+# shellcheck source=../common/unix/mqtt_broker.sh
source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh
index ca24a70e..d8df4375 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/fbx_linux.sh
+"$BASEDIR/../common/linux/fbx_linux.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh
index ed9d6679..cb23bbca 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh
@@ -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
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh
index ffe96d30..a6c4dfff 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh
@@ -35,4 +35,5 @@
set -ex
+# shellcheck source=../common/linux/android_linux.sh
source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh
index 6cc2b44f..049cdd2d 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh
@@ -33,4 +33,5 @@
##
#############################################################################
+# shellcheck source=../common/linux/open62541.sh
source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh
index 27ff15c3..e4281588 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/unix/squishInstall.sh
+"$BASEDIR/../common/unix/squishInstall.sh"