diff options
author | Liang Qi <liang.qi@qt.io> | 2019-10-01 11:25:16 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-10-03 06:12:24 +0200 |
commit | ec7bf6356ccbdaf14f5274e36f49d73013fc5a06 (patch) | |
tree | 5dfb5ecf03920307bb56d8df4ac87155d0efa3a2 /coin/provisioning/common/unix/squishInstall.sh | |
parent | 7cd2473966b08aab3117dc58025a209c68283a44 (diff) | |
parent | 29befcc995ebb3572ebe082c28e0e01f47b2baa2 (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'coin/provisioning/common/unix/squishInstall.sh')
-rwxr-xr-x | coin/provisioning/common/unix/squishInstall.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index b40c1922..f1b5e6b5 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -122,7 +122,7 @@ function MountAndInstall { sudo cp $targetFileMount /tmp UnMount sudo hdiutil attach "/tmp/$targetFile" - sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 + sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null mountFolder="/Volumes/froglogic Squish" UnMount elif [[ $targetFile == *.run ]]; then @@ -130,7 +130,7 @@ function MountAndInstall { sudo cp $targetFileMount $targetDirectory UnMount sudo chmod +x $targetDirectory/$targetFile - sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 + sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null sudo rm -fr "$targetDirectory/$targetFile" if uname -a |grep -q "Ubuntu"; then sudo mkdir /usr/lib/tcl8.6 |