aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2018-04-11 09:50:31 +0300
committerLiang Qi <liang.qi@qt.io>2018-04-29 13:20:32 +0000
commiteccb53c6073a6e38feda6de840d1351105fb0c07 (patch)
tree294d027143824a2ecfc46e99ea5b624a158649d2
parent9bf79e6bab6a49622e754b25b01bd24974bd23c7 (diff)
Fix shellcheck complaints in common macos provisioning scripts
Change-Id: I9d6891a2956f66ebf2ca759c4085acad30a84618 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
-rwxr-xr-xcoin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh2
-rwxr-xr-xcoin/provisioning/common/macos/InstallPKGFromURL.sh4
-rwxr-xr-xcoin/provisioning/common/macos/fbx_macos.sh2
-rwxr-xr-xcoin/provisioning/common/macos/install-commandlinetools.sh9
-rwxr-xr-xcoin/provisioning/common/macos/python2.sh2
-rwxr-xr-xcoin/provisioning/common/macos/python3.sh2
-rwxr-xr-xcoin/provisioning/common/macos/sha1sum-compatibility.sh1
7 files changed, 11 insertions, 11 deletions
diff --git a/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh
index d20a4ed8..1dd48e87 100755
--- a/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh
@@ -39,7 +39,7 @@
set -ex
-# shellcheck source=DownloadURL.sh
+# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
function InstallAppFromCompressedFileFromURL {
diff --git a/coin/provisioning/common/macos/InstallPKGFromURL.sh b/coin/provisioning/common/macos/InstallPKGFromURL.sh
index f5c4e2e4..77ef128a 100755
--- a/coin/provisioning/common/macos/InstallPKGFromURL.sh
+++ b/coin/provisioning/common/macos/InstallPKGFromURL.sh
@@ -50,8 +50,8 @@ function InstallPKGFromURL {
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
)
echo "Checking SHA1 on PKG '$targetFile'"
- echo "$expectedSha1 *$targetFile" > $targetFile.sha1
- /usr/bin/shasum --check $targetFile.sha1
+ echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"
+ /usr/bin/shasum --check "$targetFile.sha1"
echo "Run installer on PKG"
sudo installer -package "$targetFile" -target "$targetDirectory"
echo "Removing file '$targetFile'"
diff --git a/coin/provisioning/common/macos/fbx_macos.sh b/coin/provisioning/common/macos/fbx_macos.sh
index 40776938..7e58a107 100755
--- a/coin/provisioning/common/macos/fbx_macos.sh
+++ b/coin/provisioning/common/macos/fbx_macos.sh
@@ -48,8 +48,6 @@ targetFolder="/tmp"
targetFile="$targetFolder/$fileName"
installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg"
-ExceptionExtractPrimaryUrl=100
-
echo "Extracting '$cachedUrl'"
tar -xzf "$cachedUrl" -C "$targetFolder" || (
echo "Failed to uncompress from '$cachedUrl'"
diff --git a/coin/provisioning/common/macos/install-commandlinetools.sh b/coin/provisioning/common/macos/install-commandlinetools.sh
index 18ff1036..2be234e7 100755
--- a/coin/provisioning/common/macos/install-commandlinetools.sh
+++ b/coin/provisioning/common/macos/install-commandlinetools.sh
@@ -32,6 +32,7 @@
## $QT_END_LICENSE$
##
#############################################################################
+# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
set -ex
@@ -44,19 +45,19 @@ function InstallCommandLineTools {
packageName=$4
version=$5
- DownloadURL $url $url_alt $expectedSha1 /tmp/$packageName
+ DownloadURL "$url" "$url_alt" "$expectedSha1" "/tmp/$packageName"
echo "Mounting $packageName"
- hdiutil attach /tmp/$packageName
+ hdiutil attach "/tmp/$packageName"
cd "/Volumes/Command Line Developer Tools"
echo "Installing"
- sudo installer -verbose -pkg *.pkg -target /
+ sudo installer -verbose -pkg ./*.pkg -target /
cd /
# Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
sleep 3
echo "Unmounting"
umount /Volumes/Command\ Line\ Developer\ Tools/
echo "Removing $packageName"
- rm /tmp/$packageName
+ rm "/tmp/$packageName"
echo "Command Line Tools = $version" >> ~/versions.txt
}
diff --git a/coin/provisioning/common/macos/python2.sh b/coin/provisioning/common/macos/python2.sh
index 687b9be5..f4016f8d 100755
--- a/coin/provisioning/common/macos/python2.sh
+++ b/coin/provisioning/common/macos/python2.sh
@@ -37,7 +37,7 @@
# shellcheck source=./InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
-# shellcheck source=./../unix/SetEnvVar.sh
+# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# shellcheck source=./pip.sh
source "${BASH_SOURCE%/*}/pip.sh"
diff --git a/coin/provisioning/common/macos/python3.sh b/coin/provisioning/common/macos/python3.sh
index f2876a20..545a6d02 100755
--- a/coin/provisioning/common/macos/python3.sh
+++ b/coin/provisioning/common/macos/python3.sh
@@ -38,7 +38,7 @@
# shellcheck source=./InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
-# shellcheck source=./../unix/SetEnvVar.sh
+# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# shellcheck source=./pip.sh
source "${BASH_SOURCE%/*}/pip.sh"
diff --git a/coin/provisioning/common/macos/sha1sum-compatibility.sh b/coin/provisioning/common/macos/sha1sum-compatibility.sh
index 5080f8fc..c3936499 100755
--- a/coin/provisioning/common/macos/sha1sum-compatibility.sh
+++ b/coin/provisioning/common/macos/sha1sum-compatibility.sh
@@ -45,5 +45,6 @@
# /usr/local/bin/sha1sum -> /usr/bin/shasum5.18
[ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin
+# shellcheck disable=SC2012
SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1)
sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum