diff options
Diffstat (limited to 'coin/provisioning/common/linux')
-rwxr-xr-x | coin/provisioning/common/linux/android_linux.sh | 13 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/cmake_linux.sh | 5 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/disable-ntp_linux.sh | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/fbx_linux.sh | 3 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/integrity.sh | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/open62541.sh | 6 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/openssl_for_android_linux.sh | 8 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/qnx_700.sh | 1 |
8 files changed, 31 insertions, 9 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 5679c4c6..68e77dd1 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -37,8 +37,11 @@ # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version +# shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh" +# shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" targetFolder="/opt/android" @@ -78,10 +81,11 @@ else fi echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." +# shellcheck disable=SC2031 if [ "$http_proxy" != "" ]; then - proxy_host=$(echo $proxy | cut -d'/' -f3 | cut -d':' -f1) - proxy_port=$(echo $proxy | cut -d':' -f3) - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host=$proxy_host --proxy_port=$proxy_port "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" + proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1) + proxy_port=$(echo "$proxy" | cut -d':' -f3) + echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" else echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" fi @@ -91,12 +95,13 @@ SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" +# shellcheck disable=SC2129 echo "Android SDK tools = $toolsVersion" >> ~/versions.txt echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt echo "Android NDK = $ndkVersion" >> ~/versions.txt -cd $sdkTargetFolder/tools/bin +cd "$sdkTargetFolder/tools/bin" echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86" echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-21;google_apis;x86" -c 2048M -f # Purely informative, show the list of avd devices diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 7154d822..9b4f6851 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -37,7 +37,9 @@ # CMake is needed for autotests that verify that Qt can be built with CMake +# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" +# shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="3.6.2" @@ -50,3 +52,6 @@ appPrefix="cmake-$version-Linux-x86_64" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" SetEnvVar "PATH" "$targetFolder/bin:\$PATH" + +echo "CMake = $version" >> ~/versions.txt + diff --git a/coin/provisioning/common/linux/disable-ntp_linux.sh b/coin/provisioning/common/linux/disable-ntp_linux.sh index 56f98c52..b73e44a5 100755 --- a/coin/provisioning/common/linux/disable-ntp_linux.sh +++ b/coin/provisioning/common/linux/disable-ntp_linux.sh @@ -40,5 +40,5 @@ echo "Disable Network Time Protocol (NTP)" if uname -a |grep -q "Ubuntu"; then sudo timedatectl set-ntp false else - systemctl &>/dev/null && sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off + (systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off fi diff --git a/coin/provisioning/common/linux/fbx_linux.sh b/coin/provisioning/common/linux/fbx_linux.sh index a6c00f61..f04eb89f 100755 --- a/coin/provisioning/common/linux/fbx_linux.sh +++ b/coin/provisioning/common/linux/fbx_linux.sh @@ -34,7 +34,10 @@ ############################################################################# # This script installs FBX SDK + +# shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" set -e diff --git a/coin/provisioning/common/linux/integrity.sh b/coin/provisioning/common/linux/integrity.sh index e291358d..180881a3 100755 --- a/coin/provisioning/common/linux/integrity.sh +++ b/coin/provisioning/common/linux/integrity.sh @@ -35,7 +35,9 @@ # This script installs INTEGRITY +# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" +# shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="11.4.4" diff --git a/coin/provisioning/common/linux/open62541.sh b/coin/provisioning/common/linux/open62541.sh index 4d907f17..433748d1 100755 --- a/coin/provisioning/common/linux/open62541.sh +++ b/coin/provisioning/common/linux/open62541.sh @@ -35,6 +35,8 @@ set +e +# shellcheck disable=SC1090 + # We need to source to be able to use cmake in the shell if uname -a |grep -q "Ubuntu"; then source ~/.profile @@ -44,11 +46,13 @@ fi set -ex +# shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory" +# shellcheck disable=SC2064 trap "sudo rm -fr $TEMPDIR" EXIT -cd $TEMPDIR +cd "$TEMPDIR" sudo pip install --upgrade pip sudo pip install six diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index 30022c39..353722f2 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -36,15 +36,17 @@ # This script install OpenSSL from sources. # Requires GCC and Perl to be in PATH. +# shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="1.0.2g" +version="1.0.2o" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz" targetFile="/tmp/openssl-$version.tar.gz" installFolder="/home/qt/" -sha="36af23887402a5ea4ebef91df8e61654906f58f2" +sha="a47faaca57b47a0d9d5fb085545857cc92062691" # Until every VM doing Linux Android builds have provisioned the env variable # OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin. # QTQAINFRA-1436 @@ -54,7 +56,7 @@ DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" tar -xzf "$targetFile" -C "$installFolder" # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436) -mv "${opensslHome}g" "${opensslHome}" +mv "${opensslHome}o" "${opensslHome}" pushd "$opensslHome" echo "Running configure" diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index b53c1d26..49fb7243 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -37,6 +37,7 @@ set -ex +# shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" targetFolder="/opt/" |