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

Fix shellcheck complaints in provisioning scripts

Browse Source 
Change-Id: I38306c6d2ff360dc12f8c33b289bbc4ae4935aca
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:13:53 +03:00
committed by Liang Qi
parent 1125bbae42
commit 9bf79e6bab
11 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
coin/provisioning/common/unix/squishInstall.sh
View File

@@ -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