From a3f4bf703b9d76b6aa8224240a017d006237f85b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 25 Aug 2017 09:52:12 +0300 Subject: Provisioning: Fix helper function's mktemp in macOS 10.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3