From b2afcc84055a7d1fe8c8ede56961d52e19782a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 26 Mar 2019 13:01:21 +0200 Subject: Fix shellcheck complaints from provisioning scripts Change-Id: I8d1ee4241d7e99269e8c717ceb2aecde3194c51a Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh') 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" -- cgit v1.2.3