summaryrefslogtreecommitdiffstats
path: root/coin/provisioning/qtci-macos-10.13-x86_64
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 /coin/provisioning/qtci-macos-10.13-x86_64
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>
Diffstat (limited to 'coin/provisioning/qtci-macos-10.13-x86_64')
-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
18 files changed, 29 insertions, 22 deletions
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"