diff options
Diffstat (limited to 'coin/provisioning/qtci-macos-10.12-x86_64')
16 files changed, 29 insertions, 16 deletions
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" |