summaryrefslogtreecommitdiff
path: root/coin
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2020-05-05 08:28:51 +0300
committerHeikki Halmet <heikki.halmet@qt.io>2020-06-12 08:33:24 +0300
commit5be3dc5f60dff51c8045ceb946209e61cf79d9b0 (patch)
tree583f27ac26d3629dc769bb813457f59e1020d070 /coin
parent3bd4b2760eb68b528ab26b80f9eaa40a55803211 (diff)
downloadqt5-5be3dc5f60dff51c8045ceb946209e61cf79d9b0.tar.gz
Provisioning: Change mounting folder for Squish installation
Sometimes some process is locking the mounted folder (/tmp) so that it can't be unmounted untill the process has been ended. Let's create squish folder under tmp and use that for mounting instead Task-number: QTQAINFRA-3709 Change-Id: I49ab8fd90af37a670e45764a176b62d7a732cc6c Reviewed-by: Dimitrios Apostolou <jimis@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit c671c2352e1db453da17d346316acfa627617786) Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Diffstat (limited to 'coin')
-rwxr-xr-xcoin/provisioning/common/unix/squishInstall.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh
index a0c23350..7592814b 100755
--- a/coin/provisioning/common/unix/squishInstall.sh
+++ b/coin/provisioning/common/unix/squishInstall.sh
@@ -55,22 +55,21 @@ else
sha1="63f33de55770e2588dd9f482546900e33d20f8ec"
fi
+mountFolder="/tmp/squish"
+sudo mkdir "$mountFolder"
+
# Check which platform
if uname -a |grep -q Darwin; then
usersGroup="staff"
- mountFolder="/Volumes"
squishLicenseDir="/Users/qt"
elif uname -a |grep -q "el7"; then
usersGroup="qt"
- mountFolder="/tmp"
squishLicenseDir="/root"
elif uname -a |grep -q "Ubuntu"; then
usersGroup="users"
- mountFolder="/tmp"
squishLicenseDir="/home/qt"
else
usersGroup="users"
- mountFolder="/tmp"
squishLicenseDir="/root"
fi