summaryrefslogtreecommitdiffstats
path: root/coin/provisioning
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-05-20 10:18:31 +0300
commitc671c2352e1db453da17d346316acfa627617786 (patch)
tree5e24028797d0ba5d115f79c25bc32fa73c2d8497 /coin/provisioning
parentb0286d6cd6c86cfc3c5dbd5a3879354996632831 (diff)
Provisioning: Change mounting folder for Squish installation5.14
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>
Diffstat (limited to 'coin/provisioning')
-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