lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix shellcheck complaints from provisioning scripts

Browse Source 
Change-Id: I8d1ee4241d7e99269e8c717ceb2aecde3194c51a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This commit is contained in:
Tony Sarajärvi
2019-03-26 13:01:21 +02:00
parent f678ae3769
commit b2afcc8405
60 changed files with 95 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
View File

@@ -124,7 +124,8 @@ sudo pip install virtualenv wheel
sudo /usr/local/bin/pip3 install wheel sudo /usr/local/bin/pip3 install wheel
# Install all needed packages in a special wheel cache directory # 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" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

1
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh
View File

@@ -37,6 +37,7 @@
set -ex set -ex
# shellcheck source=../common/unix/check_and_set_proxy.sh
source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
NTS_IP=10.212.2.216 NTS_IP=10.212.2.216

5
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
View File

@@ -45,7 +45,7 @@ for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-dai
done done
# aptdaemon is used by update notifiers and similar and there is no point in having those (the symptom is aptd holding a lock) # 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 echo attempting to remove aptdaemon
sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y remove aptdaemon || true sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y remove aptdaemon || true
# check that aptdaemon is no longer installed # check that aptdaemon is no longer installed
@@ -178,7 +178,8 @@ echo "Installing packages"
sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
# Install all needed packages in a special wheel cache directory # 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" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

1
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh
View File

@@ -1,3 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck source=../common/linux/disable-ntp_linux.sh
source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh"

3
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh
View File

@@ -33,4 +33,7 @@
## ##
############################################################################# #############################################################################
set -ex
# shellcheck source=../common/unix/mqtt_broker.sh
source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"

2
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh
View File

@@ -3,4 +3,4 @@
set -ex set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/linux/fbx_linux.sh "$BASEDIR/../common/linux/fbx_linux.sh"

0
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh Normal file → Executable file
View File

1
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh
View File

@@ -35,4 +35,5 @@
set -ex set -ex
# shellcheck source=../common/linux/android_linux.sh
source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh"

2
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/linux/cmake_linux.sh "$BASEDIR/../common/linux/cmake_linux.sh"

1
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh
View File

@@ -35,4 +35,5 @@
set -ex set -ex
# shellcheck source=../common/linux/qnx_660.sh
source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh" source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh"

1
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh
View File

@@ -35,4 +35,5 @@
set -ex set -ex
# shellcheck source=../common/linux/qnx_700.sh
source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"

2
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh
View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/linux/docker.sh "$BASEDIR/../common/linux/docker.sh"

2
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/unix/squishInstall.sh "$BASEDIR/../common/unix/squishInstall.sh"

2
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
View File

@@ -168,7 +168,7 @@ waitLoop
sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
# Install all needed packages in a special wheel cache directory # 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" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh
View File

@@ -34,6 +34,7 @@
set -ex set -ex
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
# build latest qemu to usermode # build latest qemu to usermode

4
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
View File

@@ -37,7 +37,9 @@
set -ex set -ex
# shellcheck source=../common/unix/DownloadURL.sh
source "${BASH_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" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
echo "Installing Yocto toolchain for 32-bit b2qt..." echo "Installing Yocto toolchain for 32-bit b2qt..."
@@ -76,7 +78,7 @@ chmod +x "$yoctoInstaller"
/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64" /bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64"
rm -rf "$yoctoInstaller" 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_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7"
SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7" SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7"
SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64" SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh
View File

@@ -35,6 +35,7 @@
set -ex set -ex
# shellcheck source=../common/unix/DownloadURL.sh
source "${BASH_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" url="http://ci-files01-hki.intra.qt.io/input/semisecure/test_farm_id_rsa"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh
View File

@@ -35,4 +35,5 @@
set -ex set -ex
# shellcheck source=../common/linux/openssl_for_android_linux.sh
source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh"

3
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh
View File

@@ -33,4 +33,7 @@
## ##
############################################################################# #############################################################################
set -ex
# shellcheck source=../common/unix/mqtt_broker.sh
source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh
View File

@@ -35,4 +35,5 @@
set -ex set -ex
# shellcheck source=../common/linux/qnx_660.sh
source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh" source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh
View File

@@ -35,4 +35,5 @@
set -ex set -ex
# shellcheck source=../common/linux/qnx_700.sh
source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"

2
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh
View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/linux/docker.sh "$BASEDIR/../common/linux/docker.sh"

1
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh
View File

@@ -1,3 +1,4 @@
#!/bin/bash #!/bin/bash
# shellcheck source=../common/linux/squish-coco.sh
source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh" source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh"

2
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh
View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/linux/ubuntu-version.sh "$BASEDIR/../common/linux/ubuntu-version.sh"

3
coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
View File

@@ -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 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 # 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" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

1
coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh
View File

@@ -35,4 +35,5 @@
set -ex set -ex
# shellcheck source=../common/linux/emsdk.sh
source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh" source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh"

4
coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh
View File

@@ -1,3 +1,5 @@
#!/usr/bin/env bash #!/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"

5
coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh
View File

@@ -1,2 +1,5 @@
#!/usr/bin/env bash #!/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"

2
coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
View File

@@ -39,7 +39,7 @@
set -ex set -ex
# shellcheck source=../common/macos/InstallPKGFromURL # shellcheck source=../common/macos/InstallPKGFromURL.sh
source "${BASH_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" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg"

4
coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
View File

@@ -1,3 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/java.sh "$BASEDIR/../common/macos/java.sh"

1
coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
View File

@@ -35,6 +35,7 @@
set -ex set -ex
# shellcheck source=../common/macos/install-commandlinetools.sh
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
version="9.2" version="9.2"

2
coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
View File

@@ -3,4 +3,4 @@
set -ex set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/cmake.sh "$BASEDIR/../common/macos/cmake.sh"

2
coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
View File

@@ -3,4 +3,4 @@
set -ex set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/homebrew.sh "$BASEDIR/../common/macos/homebrew.sh"

1
coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh
View File

@@ -1,4 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
# shellcheck source=../common/macos/python2.sh
source "${BASH_SOURCE%/*}/../common/macos/python2.sh" source "${BASH_SOURCE%/*}/../common/macos/python2.sh"

1
coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
View File

@@ -1,4 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
# shellcheck source=../common/macos/python3.sh
source "${BASH_SOURCE%/*}/../common/macos/python3.sh" source "${BASH_SOURCE%/*}/../common/macos/python3.sh"

2
coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh
View File

@@ -4,4 +4,4 @@
set -ex set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/libiodbc.sh "$BASEDIR/../common/macos/libiodbc.sh"

2
coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
View File

@@ -3,4 +3,4 @@
set -ex set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/virtualenv.sh "$BASEDIR/../common/macos/virtualenv.sh"

2
coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
View File

@@ -4,4 +4,4 @@ set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
# There is only one mac package # There is only one mac package
$BASEDIR/../common/unix/libclang.sh "$BASEDIR/../common/unix/libclang.sh"

2
coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
View File

@@ -3,5 +3,5 @@
set -ex set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/fbx_macos.sh "$BASEDIR/../common/macos/fbx_macos.sh"

1
coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
View File

@@ -2,4 +2,5 @@
set -ex set -ex
# shellcheck source=../common/macos/install_openssl.sh
source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh"

10
coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh
View File

@@ -62,7 +62,7 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen
# Login keychain # Login keychain
sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" 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 loginKeychain=$keychains/login.keychain
echo "Setting login.keychain as default keychain.." echo "Setting login.keychain as default keychain.."
@@ -104,7 +104,7 @@ open "$keychains/$devIDKeychain"
sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" 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.." echo "Unlocking $devIDKeychain with password.."
security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain 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" sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios
iosPassword=$(<"$targetFolder/ios_password.txt") iosPassword=$(cat "$targetFolder/ios_password.txt")
iPhoneDeveloper="iosdevelopment.p12" iPhoneDeveloper="iosdevelopment.p12"
shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c" shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
echo "Importing $iPhoneDeveloper.." 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" iPhoneDistribution="iosdistribution.p12"
shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171" shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
echo "Importing $iPhoneDistribution.." 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 # Mobileprovision
echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."

6
coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh
View File

@@ -1,4 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
BASEDIR=$(dirname "$0") set -ex
$BASEDIR/../common/unix/squishInstall.sh
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/squishInstall.sh"

3
coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh
View File

@@ -1,3 +1,4 @@
#!/usr/bin/env bash #!/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"

5
coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh
View File

@@ -1,2 +1,5 @@
#!/usr/bin/env bash #!/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"

2
coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh
View File

@@ -39,7 +39,7 @@
set -ex set -ex
# shellcheck source=../common/macos/InstallPKGFromURL # shellcheck source=../common/macos/InstallPKGFromURL.sh
source "${BASH_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" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg"

4
coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh
View File

@@ -1,3 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/java.sh "$BASEDIR/../common/macos/java.sh"

1
coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh
View File

@@ -35,6 +35,7 @@
set -ex set -ex
# shellcheck source=../common/macos/install-commandlinetools.sh
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
version="10.1" version="10.1"

2
coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh
View File

@@ -3,4 +3,4 @@
set -ex set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/cmake.sh "$BASEDIR/../common/macos/cmake.sh"

2
coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh
View File

@@ -3,4 +3,4 @@
set -ex set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/homebrew.sh "$BASEDIR/../common/macos/homebrew.sh"

2
coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh
View File

@@ -3,4 +3,4 @@
set -ex set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/pip.sh "$BASEDIR/../common/macos/pip.sh"

1
coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh
View File

@@ -1,4 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
# shellcheck source=../common/macos/python2.sh
source "${BASH_SOURCE%/*}/../common/macos/python2.sh" source "${BASH_SOURCE%/*}/../common/macos/python2.sh"

1
coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh
View File

@@ -1,4 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
# shellcheck source=../common/macos/python3.sh
source "${BASH_SOURCE%/*}/../common/macos/python3.sh" source "${BASH_SOURCE%/*}/../common/macos/python3.sh"

2
coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh
View File

@@ -4,4 +4,4 @@
set -ex set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/libiodbc.sh "$BASEDIR/../common/macos/libiodbc.sh"

2
coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh
View File

@@ -3,4 +3,4 @@
set -ex set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/virtualenv.sh "$BASEDIR/../common/macos/virtualenv.sh"

2
coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh
View File

@@ -4,4 +4,4 @@ set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
# There is only one mac package and common script uses it as a default # There is only one mac package and common script uses it as a default
$BASEDIR/../common/unix/libclang.sh "$BASEDIR/../common/unix/libclang.sh"

5
coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
View File

@@ -57,12 +57,7 @@ sdkBuildToolsVersion="28.0.3"
# this is compile sdk version # this is compile sdk version
sdkApiLevel="android-28" sdkApiLevel="android-28"
toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad"
ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440"
toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile" toolsSourceFile="$basePath/$toolsFile"
ndkTargetFile="/tmp/$ndkFile"
ndkSourceFile="$basePath/$ndkFile" ndkSourceFile="$basePath/$ndkFile"
echo "Unzipping Android NDK to '$targetFolder'" echo "Unzipping Android NDK to '$targetFolder'"

2
coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh
View File

@@ -3,5 +3,5 @@
set -ex set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
$BASEDIR/../common/macos/fbx_macos.sh "$BASEDIR/../common/macos/fbx_macos.sh"

1
coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh
View File

@@ -2,4 +2,5 @@
set -ex set -ex
# shellcheck source=../common/macos/install_openssl.sh
source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh" source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh"

10
coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh
View File

@@ -62,7 +62,7 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen
# Login keychain # Login keychain
sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" 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 loginKeychain=$keychains/login.keychain
echo "Setting login.keychain as default keychain.." echo "Setting login.keychain as default keychain.."
@@ -104,7 +104,7 @@ open "$keychains/$devIDKeychain"
sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" 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.." echo "Unlocking $devIDKeychain with password.."
{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null { 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" sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null { 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" iPhoneDeveloper="iosdevelopment_2019.p12"
shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c" shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
echo "Importing $iPhoneDeveloper.." 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" iPhoneDistribution="iosdistribution_2019.p12"
shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac" shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
echo "Importing $iPhoneDistribution.." 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 # Mobileprovision
echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."

6
coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh
View File

@@ -1,4 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
BASEDIR=$(dirname "$0") set -ex
$BASEDIR/../common/unix/squishInstall.sh
BASEDIR=$(dirname "$0")
"$BASEDIR/../common/unix/squishInstall.sh"