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

Make Java installation independent from the disks in the system

Browse Source 
Assuming that the JDK dmg will always be mounted via /dev/disk1s1 breaks
when another disk is present in the system and the DMG ends up at disk2
for example.

Change-Id: Ia196a6ae18f455144802167c0887bf18dafbc101
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
Simon Hausmann
2017-04-24 12:18:53 +02:00
parent 69da4dda48
commit 9884a4e98e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh
View File

@@ -79,7 +79,8 @@ try
echo Installing JDK echo Installing JDK
(cd /Volumes/JDK\ 8\ Update\ 102/ && sudo installer -package JDK\ 8\ Update\ 102.pkg -target /) || throw $ExceptionInstall (cd /Volumes/JDK\ 8\ Update\ 102/ && sudo installer -package JDK\ 8\ Update\ 102.pkg -target /) || throw $ExceptionInstall
hdiutil detach /dev/disk1s1 || throw $ExceptionDetachImage disk=`hdiutil info | grep '/Volumes/JDK 8 Update 102' | awk '{print $1}'`
hdiutil detach $disk || throw $ExceptionDetachImage
echo "Removing temporary file '$targetFile'" echo "Removing temporary file '$targetFile'"
rm "$targetFile" || throw $ExceptionRemoveTmpFile rm "$targetFile" || throw $ExceptionRemoveTmpFile