diff options
| author | Simo Fält <simo.falt@qt.io> | 2017-08-25 09:52:12 +0300 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-04 14:23:05 +0000 |
| commit | a3f4bf703b9d76b6aa8224240a017d006237f85b (patch) | |
| tree | 3359ac3eddd90a22ace4d3b8c91deeaf981c255e | |
| parent | 44cf10382c5586a326a0f2c60aff23ec5bc5cebc (diff) | |
Provisioning: Fix helper function's mktemp in macOS 10.10
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>
| -rw-r--r-- | coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh index b6072062..bee16dd2 100644 --- a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh @@ -74,7 +74,12 @@ function InstallAppFromCompressedFileFromURL { echo "Extension for file: $extension" echo "Creating temporary file and directory" 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" echo "Uncompress $targetFile" case $extension in |