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

Provisioning: Fix helper function's mktemp in macOS 10.10

Browse Source 
It seems that macOS 10.10 has a non standard mktemp command. It doesn't
work as expected but prints usage and exit instead.

Change-Id: I37be6eb01474466c2b6bbae4f38876673bd9c295
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
This commit is contained in:
Simo Fält
2017-08-25 09:52:12 +03:00
committed by Simon Hausmann
parent 44cf10382c
commit a3f4bf703b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh
View File

@@ -74,7 +74,12 @@ function InstallAppFromCompressedFileFromURL {
echo "Extension for file: $extension" echo "Extension for file: $extension"
echo "Creating temporary file and directory" echo "Creating temporary file and directory"
targetFile=$(mktemp "$TMPDIR$(uuidgen).$extension") || throw $ExceptionCreateTmpFile targetFile=$(mktemp "$TMPDIR$(uuidgen).$extension") || throw $ExceptionCreateTmpFile
targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory # macOS 10.10 mktemp does require prefix
if [[ $OSTYPE == "darwin14" ]]; then
targetDirectory=$(mktemp -d -t '10.10') || throw $ExceptionCreateTmpDirectory
else
targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory
fi
DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile" DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile"
echo "Uncompress $targetFile" echo "Uncompress $targetFile"
case $extension in case $extension in