lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-09 12:37:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix shellcheck complaints in common macos provisioning scripts

Browse Source 
Change-Id: I9d6891a2956f66ebf2ca759c4085acad30a84618
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
This commit is contained in:
Tony Sarajärvi
2018-04-11 09:50:31 +03:00
committed by Liang Qi
parent 9bf79e6bab
commit eccb53c607
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh
View File

@@ -39,7 +39,7 @@
set -ex set -ex
# shellcheck source=DownloadURL.sh # shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
function InstallAppFromCompressedFileFromURL { function InstallAppFromCompressedFileFromURL {

4
coin/provisioning/common/macos/InstallPKGFromURL.sh
View File

@@ -50,8 +50,8 @@ function InstallPKGFromURL {
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
) )
echo "Checking SHA1 on PKG '$targetFile'" echo "Checking SHA1 on PKG '$targetFile'"
echo "$expectedSha1 *$targetFile" > $targetFile.sha1 echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"
/usr/bin/shasum --check $targetFile.sha1 /usr/bin/shasum --check "$targetFile.sha1"
echo "Run installer on PKG" echo "Run installer on PKG"
sudo installer -package "$targetFile" -target "$targetDirectory" sudo installer -package "$targetFile" -target "$targetDirectory"
echo "Removing file '$targetFile'" echo "Removing file '$targetFile'"

2
coin/provisioning/common/macos/fbx_macos.sh
View File

@@ -48,8 +48,6 @@ targetFolder="/tmp"
targetFile="$targetFolder/$fileName" targetFile="$targetFolder/$fileName"
installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg" installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg"
ExceptionExtractPrimaryUrl=100
echo "Extracting '$cachedUrl'" echo "Extracting '$cachedUrl'"
tar -xzf "$cachedUrl" -C "$targetFolder" || ( tar -xzf "$cachedUrl" -C "$targetFolder" || (
echo "Failed to uncompress from '$cachedUrl'" echo "Failed to uncompress from '$cachedUrl'"

9
coin/provisioning/common/macos/install-commandlinetools.sh
View File

@@ -32,6 +32,7 @@
## $QT_END_LICENSE$ ## $QT_END_LICENSE$
## ##
############################################################################# #############################################################################
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
set -ex set -ex
@@ -44,19 +45,19 @@ function InstallCommandLineTools {
packageName=$4 packageName=$4
version=$5 version=$5
DownloadURL $url $url_alt $expectedSha1 /tmp/$packageName DownloadURL "$url" "$url_alt" "$expectedSha1" "/tmp/$packageName"
echo "Mounting $packageName" echo "Mounting $packageName"
hdiutil attach /tmp/$packageName hdiutil attach "/tmp/$packageName"
cd "/Volumes/Command Line Developer Tools" cd "/Volumes/Command Line Developer Tools"
echo "Installing" echo "Installing"
sudo installer -verbose -pkg *.pkg -target / sudo installer -verbose -pkg ./*.pkg -target /
cd / cd /
# Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted # Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
sleep 3 sleep 3
echo "Unmounting" echo "Unmounting"
umount /Volumes/Command\ Line\ Developer\ Tools/ umount /Volumes/Command\ Line\ Developer\ Tools/
echo "Removing $packageName" echo "Removing $packageName"
rm /tmp/$packageName rm "/tmp/$packageName"
echo "Command Line Tools = $version" >> ~/versions.txt echo "Command Line Tools = $version" >> ~/versions.txt
} }

2
coin/provisioning/common/macos/python2.sh
View File

@@ -37,7 +37,7 @@
# shellcheck source=./InstallPKGFromURL.sh # shellcheck source=./InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh" source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
# shellcheck source=./../unix/SetEnvVar.sh # shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# shellcheck source=./pip.sh # shellcheck source=./pip.sh
source "${BASH_SOURCE%/*}/pip.sh" source "${BASH_SOURCE%/*}/pip.sh"

2
coin/provisioning/common/macos/python3.sh
View File

@@ -38,7 +38,7 @@
# shellcheck source=./InstallPKGFromURL.sh # shellcheck source=./InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh" source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
# shellcheck source=./../unix/SetEnvVar.sh # shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# shellcheck source=./pip.sh # shellcheck source=./pip.sh
source "${BASH_SOURCE%/*}/pip.sh" source "${BASH_SOURCE%/*}/pip.sh"

1
coin/provisioning/common/macos/sha1sum-compatibility.sh
View File

@@ -45,5 +45,6 @@
# /usr/local/bin/sha1sum -> /usr/bin/shasum5.18 # /usr/local/bin/sha1sum -> /usr/bin/shasum5.18
[ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin [ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin
# shellcheck disable=SC2012
SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1) SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1)
sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum