From 5be3dc5f60dff51c8045ceb946209e61cf79d9b0 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 5 May 2020 08:28:51 +0300 Subject: Provisioning: Change mounting folder for Squish installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Tony Sarajärvi (cherry picked from commit c671c2352e1db453da17d346316acfa627617786) Reviewed-by: Johanna Äijälä --- coin/provisioning/common/unix/squishInstall.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'coin/provisioning') 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 -- cgit v1.2.3