diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-09-10 11:16:26 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-09-10 11:16:26 +0000 |
| commit | 2ef18dac6cdab60e8a99dfc3ffb2ba3b06a5f3bf (patch) | |
| tree | 155cd4eccb5b298f93fe36437b9db450d6e23a6d /coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh | |
| parent | a1f173fc67587062a3e777c05131611b228f38e3 (diff) | |
| parent | dd3d32d13cf03a9e6ca661408b7995e8493c6af4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10v5.10.0-alpha1
Diffstat (limited to 'coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh')
| -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 |