aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/unix
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2018-04-11 09:13:53 +0300
committerLiang Qi <liang.qi@qt.io>2018-04-29 13:20:29 +0000
commit9bf79e6bab6a49622e754b25b01bd24974bd23c7 (patch)
treef1761d820fe67681ea4bebc8852ba992d91e16aa /coin/provisioning/common/unix
parent1125bbae42cbda0accd10c2f16acf73078a75173 (diff)
Fix shellcheck complaints in provisioning scripts
Change-Id: I38306c6d2ff360dc12f8c33b289bbc4ae4935aca Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'coin/provisioning/common/unix')
-rwxr-xr-xcoin/provisioning/common/unix/DownloadURL.sh6
-rwxr-xr-xcoin/provisioning/common/unix/check_and_set_proxy.sh1
-rwxr-xr-xcoin/provisioning/common/unix/libclang.sh10
-rwxr-xr-xcoin/provisioning/common/unix/squishInstall.sh14
4 files changed, 17 insertions, 14 deletions
diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh
index d1f2f1bf..14d1322d 100755
--- a/coin/provisioning/common/unix/DownloadURL.sh
+++ b/coin/provisioning/common/unix/DownloadURL.sh
@@ -54,8 +54,8 @@ function DownloadURL {
)
echo "Checking SHA1 on PKG '$targetFile'"
- echo "$expectedSha1 *$targetFile" > $targetFile.sha1
- sha1sum --check $targetFile.sha1
- rm -f $targetFile.sha1
+ echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"
+ sha1sum --check "$targetFile.sha1"
+ rm -f "$targetFile.sha1"
}
diff --git a/coin/provisioning/common/unix/check_and_set_proxy.sh b/coin/provisioning/common/unix/check_and_set_proxy.sh
index 1cbee166..3e55b09f 100755
--- a/coin/provisioning/common/unix/check_and_set_proxy.sh
+++ b/coin/provisioning/common/unix/check_and_set_proxy.sh
@@ -34,6 +34,7 @@
set -ex
+# shellcheck source=../shared/http_proxy.txt
source "${BASH_SOURCE%/*}/../shared/http_proxy.txt"
(wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io && echo "Setting http_proxy to $proxy" && export http_proxy=$proxy) || echo "Proxy not detected at $proxy"
diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh
index 7f29259e..5b3b6bb1 100755
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -40,10 +40,12 @@
# In case of Linux, we expect to get the values as args
set -e
+# shellcheck source=./check_and_set_proxy.sh
source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
BASEDIR=$(dirname "$0")
-. $BASEDIR/../shared/sw_versions.txt
+# shellcheck source=../shared/sw_versions.txt
+. "$BASEDIR/../shared/sw_versions.txt"
url=$1
sha1=$2
version=$3
@@ -61,10 +63,10 @@ destination="/usr/local/libclang-$version"
curl --fail -L --retry 5 --retry-delay 5 -o "$zip" "$url"
echo "$sha1 $zip" | sha1sum --check
-7z x $zip -o/tmp/
-rm -rf $zip
+7z x "$zip" -o/tmp/
+rm -rf "$zip"
-sudo mv /tmp/libclang $destination
+sudo mv /tmp/libclang "$destination"
echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile
echo "libClang = $version" >> ~/versions.txt
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh
index 0ed9b0a0..ab0102ec 100755
--- a/coin/provisioning/common/unix/squishInstall.sh
+++ b/coin/provisioning/common/unix/squishInstall.sh
@@ -93,7 +93,7 @@ function MountAndInstall {
targetFileMount="$mountFolder"/"$targetFile"
echo "Mounting $url to $mountFolder"
- sudo mount "$url" $mountFolder
+ sudo mount "$url" "$mountFolder"
echo "Create $targetDirectory if needed"
if [ ! -d "/opt" ]; then
sudo mkdir "/opt"
@@ -112,19 +112,19 @@ function MountAndInstall {
fi
sudo tar -xzf "$targetFileMount" --directory "$target"
echo "Unmounting $mountFolder"
- sudo umount $mountFolder
+ sudo umount "$mountFolder"
elif [[ $targetFile == *.dmg ]]; then
echo "'dmg-file', no need to uncompress"
- sudo cp $targetFileMount /tmp
- sudo umount $mountFolder
+ sudo cp "$targetFileMount" /tmp
+ sudo umount "$mountFolder"
sudo hdiutil attach "/tmp/$targetFile"
sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory"
sudo hdiutil unmount /Volumes/froglogic\ Squish/
elif [[ $targetFile == *.run ]]; then
echo "'run-file', no need to uncompress"
- sudo cp $targetFileMount $targetDirectory
- sudo umount $mountFolder
- sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
+ sudo cp "$targetFileMount" "$targetDirectory"
+ sudo umount "$mountFolder"
+ sudo "$targetDirectory/$targetFile" unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
sudo rm -fr "$targetDirectory/$targetFile"
if uname -a |grep -q "Ubuntu"; then
sudo mkdir /usr/lib/tcl8.6