summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2019-03-26 13:01:21 +0200
committerTony Sarajärvi <tony.sarajarvi@qt.io>2019-04-01 15:16:59 +0000
commitb2afcc84055a7d1fe8c8ede56961d52e19782a04 (patch)
tree5f11ecdefb668798676c94e0772c1ade86ac1027
parentf678ae3769e69ffc3afbd2f45ef60c92e4db5f08 (diff)
Fix shellcheck complaints from provisioning scripts
Change-Id: I8d1ee4241d7e99269e8c717ceb2aecde3194c51a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
-rwxr-xr-xcoin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh3
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh5
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh3
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh2
-rwxr-xr-x[-rw-r--r--]coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh0
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh4
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh3
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh1
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh1
-rw-r--r--coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh2
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh3
-rwxr-xr-xcoin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh1
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh5
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/20-java.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh1
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh1
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh1
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh1
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh10
-rwxr-xr-xcoin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh3
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh5
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/20-java.sh4
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh1
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh1
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh1
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/30-android.sh5
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh2
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh1
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh10
-rwxr-xr-xcoin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh4
60 files changed, 93 insertions, 50 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
index addfb673..e86870c0 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
@@ -124,7 +124,8 @@ sudo pip install virtualenv wheel
sudo /usr/local/bin/pip3 install wheel
# Install all needed packages in a special wheel cache directory
-/usr/local/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
+/usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
+# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
index 938ef37c..b917d292 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
@@ -37,6 +37,7 @@
set -ex
+# shellcheck source=../common/unix/check_and_set_proxy.sh
source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
NTS_IP=10.212.2.216
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
index 4559151e..f2eb6e60 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
@@ -45,7 +45,7 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai
done
# aptdaemon is used by update notifiers and similar and there is no point in having those (the symptom is aptd holding a lock)
-for i in `seq 10`; do
+for i in $(seq 10); do
echo attempting to remove aptdaemon
sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y remove aptdaemon || true
# check that aptdaemon is no longer installed
@@ -178,7 +178,8 @@ echo "Installing packages"
sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
# Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
+pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
+# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh
index ca31a876..89806892 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh
@@ -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"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh
index c2331d16..96b197ea 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh
@@ -33,4 +33,7 @@
##
#############################################################################
+set -ex
+
+# shellcheck source=../common/unix/mqtt_broker.sh
source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh
index ca24a70e..d8df4375 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-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-Ubuntu-16.04-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh
index 74dd1579..74dd1579 100644..100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh
index 6784335a..0527fe85 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-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-Ubuntu-16.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh
index 8f81a7dd..db8a3ff5 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh
@@ -1,5 +1,5 @@
#!/bin/bash
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/cmake_linux.sh
+"$BASEDIR/../common/linux/cmake_linux.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh
index 37aec494..4034162e 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh
@@ -35,4 +35,5 @@
set -ex
+# shellcheck source=../common/linux/qnx_660.sh
source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh
index c4740556..a2d162d3 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.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-Ubuntu-16.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh
index 4a6681f3..82c2c659 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh
@@ -1,4 +1,4 @@
#!/bin/bash
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/docker.sh
+"$BASEDIR/../common/linux/docker.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh
index 27ff15c3..e4281588 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-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"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
index 1d567a3e..dae1a58e 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
@@ -168,7 +168,7 @@ waitLoop
sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
# Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
+pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh
index e3faa20e..4ca84072 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh
@@ -34,6 +34,7 @@
set -ex
+# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
# build latest qemu to usermode
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
index fbe669d9..1c856c0c 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
@@ -37,7 +37,9 @@
set -ex
+# shellcheck source=../common/unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
echo "Installing Yocto toolchain for 32-bit b2qt..."
@@ -76,7 +78,7 @@ chmod +x "$yoctoInstaller"
/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64"
rm -rf "$yoctoInstaller"
-if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then
+if [ -e "$yoctoLocationARMv7/$sysrootARMv7" ] && [ -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" ] && [ -e "$yoctoLocationARM64/$sysrootARM64" ] && [ -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then
SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7"
SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7"
SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh
index e4d988fc..a6aa3b10 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh
@@ -35,6 +35,7 @@
set -ex
+# shellcheck source=../common/unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
url="http://ci-files01-hki.intra.qt.io/input/semisecure/test_farm_id_rsa"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh
index 0f89e72c..81ea3b17 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh
@@ -35,4 +35,5 @@
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-Ubuntu-18.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh
index 4527e984..7c58c478 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh
@@ -33,4 +33,7 @@
##
#############################################################################
+set -ex
+
+# shellcheck source=../common/unix/mqtt_broker.sh
source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh
index 1a185223..4dd1d40e 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh
@@ -35,4 +35,5 @@
set -ex
+# shellcheck source=../common/linux/qnx_660.sh
source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh
index 24ac2ac0..1d7a3968 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.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-Ubuntu-18.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh
index 4a6681f3..82c2c659 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh
@@ -1,4 +1,4 @@
#!/bin/bash
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/docker.sh
+"$BASEDIR/../common/linux/docker.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh
index 43790efd..fcc7d31c 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh
@@ -1,3 +1,4 @@
#!/bin/bash
+# shellcheck source=../common/linux/squish-coco.sh
source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh
index b062800a..c8f3ac03 100644
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh
@@ -1,4 +1,4 @@
#!/bin/bash
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/ubuntu-version.sh
+"$BASEDIR/../common/linux/ubuntu-version.sh"
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
index 208762d3..6c5d2a0f 100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
@@ -12,7 +12,8 @@ sudo pkcon -y install python-devel python-virtualenv
sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel
# Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
+pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
+# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh
index ecce5ae7..09a76778 100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh
@@ -35,4 +35,5 @@
set -ex
+# shellcheck source=../common/linux/emsdk.sh
source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh
index 32528873..3304cc3e 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh
@@ -1,3 +1,5 @@
#!/usr/bin/env bash
+set -ex
-$(dirname $0)/../common/unix/disable-ntp_macos.sh
+# shellcheck source=../common/unix/disable-ntp_macos.sh
+source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh
index d991e6c0..67e2c1f6 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh
@@ -1,2 +1,5 @@
#!/usr/bin/env bash
-$(dirname "$0")/../common/macos/disable_spotlight.sh
+set -ex
+
+# shellcheck source=../common/macos/disable_spotlight.sh
+source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
index 6d3a2bb5..6e47f6a5 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
@@ -39,7 +39,7 @@
set -ex
-# shellcheck source=../common/macos/InstallPKGFromURL
+# shellcheck source=../common/macos/InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
index 8877c40b..dcfcb93b 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
@@ -1,3 +1,5 @@
#!/usr/bin/env bash
+set -ex
+
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/java.sh
+"$BASEDIR/../common/macos/java.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
index f7aba0dc..1fa8b05d 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
@@ -35,6 +35,7 @@
set -ex
+# shellcheck source=../common/macos/install-commandlinetools.sh
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
version="9.2"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
index e5dd1910..4f4d405e 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/cmake.sh
+"$BASEDIR/../common/macos/cmake.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
index 0ead5a58..06e984ec 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/homebrew.sh
+"$BASEDIR/../common/macos/homebrew.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh
index ef65edad..7ebb8825 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
set -ex
+# shellcheck source=../common/macos/python2.sh
source "${BASH_SOURCE%/*}/../common/macos/python2.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
index 92b05bf3..eb2a4863 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
set -ex
+# shellcheck source=../common/macos/python3.sh
source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh
index 469901b5..2aedfe7b 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh
@@ -4,4 +4,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/libiodbc.sh
+"$BASEDIR/../common/macos/libiodbc.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
index a35d26ca..eaabce82 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/virtualenv.sh
+"$BASEDIR/../common/macos/virtualenv.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
index d68bf90a..33795b08 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
@@ -4,4 +4,4 @@ set -ex
BASEDIR=$(dirname "$0")
# There is only one mac package
-$BASEDIR/../common/unix/libclang.sh
+"$BASEDIR/../common/unix/libclang.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
index 9ce5d9ff..34eefeb6 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
@@ -3,5 +3,5 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/fbx_macos.sh
+"$BASEDIR/../common/macos/fbx_macos.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
index 36bcf53c..963f48d6 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
@@ -2,4 +2,5 @@
set -ex
+# shellcheck source=../common/macos/install_openssl.sh
source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh
index e1a41835..5bc77ad3 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh
@@ -62,7 +62,7 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen
# Login keychain
sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
-loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt")
+loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt")
loginKeychain=$keychains/login.keychain
echo "Setting login.keychain as default keychain.."
@@ -104,7 +104,7 @@ open "$keychains/$devIDKeychain"
sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
-DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt")
+DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt")
echo "Unlocking $devIDKeychain with password.."
security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain
@@ -112,19 +112,19 @@ security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios
-iosPassword=$(<"$targetFolder/ios_password.txt")
+iosPassword=$(cat "$targetFolder/ios_password.txt")
iPhoneDeveloper="iosdevelopment.p12"
shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
echo "Importing $iPhoneDeveloper.."
-security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign
+security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign
iPhoneDistribution="iosdistribution.p12"
shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
echo "Importing $iPhoneDistribution.."
-security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign
+security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign
# Mobileprovision
echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh
index 27ff15c3..17a0c38e 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh
@@ -1,4 +1,6 @@
#!/usr/bin/env bash
+set -ex
+
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/unix/squishInstall.sh
+"$BASEDIR/../common/unix/squishInstall.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh
index 32528873..64d43d83 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh
@@ -1,3 +1,4 @@
#!/usr/bin/env bash
-$(dirname $0)/../common/unix/disable-ntp_macos.sh
+# shellcheck source=../common/unix/disable-ntp_macos.sh
+source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh
index d991e6c0..67e2c1f6 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh
@@ -1,2 +1,5 @@
#!/usr/bin/env bash
-$(dirname "$0")/../common/macos/disable_spotlight.sh
+set -ex
+
+# shellcheck source=../common/macos/disable_spotlight.sh
+source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh
index 06437ee1..9a667c64 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh
@@ -39,7 +39,7 @@
set -ex
-# shellcheck source=../common/macos/InstallPKGFromURL
+# shellcheck source=../common/macos/InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh
index 8877c40b..dcfcb93b 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh
@@ -1,3 +1,5 @@
#!/usr/bin/env bash
+set -ex
+
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/java.sh
+"$BASEDIR/../common/macos/java.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh
index f7c251b1..d4708031 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh
@@ -35,6 +35,7 @@
set -ex
+# shellcheck source=../common/macos/install-commandlinetools.sh
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
version="10.1"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh
index e5dd1910..4f4d405e 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/cmake.sh
+"$BASEDIR/../common/macos/cmake.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh
index 0ead5a58..06e984ec 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/homebrew.sh
+"$BASEDIR/../common/macos/homebrew.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh
index 69c6b318..86db3e27 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/pip.sh
+"$BASEDIR/../common/macos/pip.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh
index ef65edad..7ebb8825 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
set -ex
+# shellcheck source=../common/macos/python2.sh
source "${BASH_SOURCE%/*}/../common/macos/python2.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh
index 92b05bf3..eb2a4863 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
set -ex
+# shellcheck source=../common/macos/python3.sh
source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh
index 469901b5..2aedfe7b 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh
@@ -4,4 +4,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/libiodbc.sh
+"$BASEDIR/../common/macos/libiodbc.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh
index a35d26ca..eaabce82 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh
@@ -3,4 +3,4 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/virtualenv.sh
+"$BASEDIR/../common/macos/virtualenv.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh
index fea11e01..aad628cb 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh
@@ -4,4 +4,4 @@ set -ex
BASEDIR=$(dirname "$0")
# There is only one mac package and common script uses it as a default
-$BASEDIR/../common/unix/libclang.sh
+"$BASEDIR/../common/unix/libclang.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
index 9d7467ef..c0d75ff6 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
@@ -57,12 +57,7 @@ sdkBuildToolsVersion="28.0.3"
# this is compile sdk version
sdkApiLevel="android-28"
-toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad"
-ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440"
-
-toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile"
-ndkTargetFile="/tmp/$ndkFile"
ndkSourceFile="$basePath/$ndkFile"
echo "Unzipping Android NDK to '$targetFolder'"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh
index 9ce5d9ff..34eefeb6 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh
@@ -3,5 +3,5 @@
set -ex
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/fbx_macos.sh
+"$BASEDIR/../common/macos/fbx_macos.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh
index 36bcf53c..963f48d6 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh
@@ -2,4 +2,5 @@
set -ex
+# shellcheck source=../common/macos/install_openssl.sh
source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh
index d9caff91..0b8595a0 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh
@@ -62,7 +62,7 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen
# Login keychain
sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
-{ loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt"); } 2> /dev/null
+{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null
loginKeychain=$keychains/login.keychain
echo "Setting login.keychain as default keychain.."
@@ -104,7 +104,7 @@ open "$keychains/$devIDKeychain"
sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
-{ DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null
+{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null
echo "Unlocking $devIDKeychain with password.."
{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null
@@ -112,19 +112,19 @@ security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
-{ iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null
+{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null
iPhoneDeveloper="iosdevelopment_2019.p12"
shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
echo "Importing $iPhoneDeveloper.."
-{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null
+{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
iPhoneDistribution="iosdistribution_2019.p12"
shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
echo "Importing $iPhoneDistribution.."
-{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null
+{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
# Mobileprovision
echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh
index 27ff15c3..17a0c38e 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh
@@ -1,4 +1,6 @@
#!/usr/bin/env bash
+set -ex
+
BASEDIR=$(dirname "$0")
-$BASEDIR/../common/unix/squishInstall.sh
+"$BASEDIR/../common/unix/squishInstall.sh"