From f16410b718b87dda7fbf4296986969df8b39838b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= <georges.duperon@gmail.com>
Date: Thu, 19 Jul 2018 23:02:45 +0200
Subject: [PATCH] macos: mktemp does not accept --suffix option, use a template
 instead

---
 test/virtualbox.sh                        |  4 ++--
 utils/ansi-screenshots/ansi_screenshot.sh |  2 +-
 utils/ansi-screenshots/to_ansi.sh         | 16 ++++++++--------
 utils/gui-wrapper.sh                      |  4 ++--
 utils/make-travis-key.sh                  |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/test/virtualbox.sh b/test/virtualbox.sh
index 52e8d66..03481d5 100755
--- a/test/virtualbox.sh
+++ b/test/virtualbox.sh
@@ -6,8 +6,8 @@ if test $# -ne 1 || test "$1" = '-h' -o "$1" = '--help'; then
 fi
 os_filename="$1"
 
-img_file="$(mktemp --suffix=".img")"
-vbox_dir="$(mktemp -d --suffix="_vbox")"
+img_file="$(mktemp tmp.XXXXXXXXXX.img)"
+vbox_dir="$(mktemp -d tmp.XXXXXXXXXX_vbox)"
 vmname="automatic-os-test-$(date +%s)-$$"
 
 ln -sf "$(readlink -f "$os_filename")" "$img_file"
diff --git a/utils/ansi-screenshots/ansi_screenshot.sh b/utils/ansi-screenshots/ansi_screenshot.sh
index ea19c03..14a2211 100755
--- a/utils/ansi-screenshots/ansi_screenshot.sh
+++ b/utils/ansi-screenshots/ansi_screenshot.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-screenshot="$(mktemp --suffix=".png")"
+screenshot="$(mktemp tmp.XXXXXXXXXX.png)"
 
 scrot "$screenshot"
 "$(dirname "$0")/to_ansi.sh" "$screenshot" 128
diff --git a/utils/ansi-screenshots/to_ansi.sh b/utils/ansi-screenshots/to_ansi.sh
index 2e1197b..407940d 100755
--- a/utils/ansi-screenshots/to_ansi.sh
+++ b/utils/ansi-screenshots/to_ansi.sh
@@ -5,14 +5,14 @@ set -e
 file="$1"
 width="$2"
 
-mini_png="$(mktemp --suffix=".png")"
-colors_gif="$(mktemp --suffix=".gif")"
-indexed_gif="$(mktemp --suffix=".gif")"
-indexed_pgm="$(mktemp --suffix=".pgm")"
-odd_lines="$(mktemp --suffix=".odd")"
-even_lines="$(mktemp --suffix=".even")"
-odd_lines_px="$(mktemp --suffix=".odd.px")"
-even_lines_px="$(mktemp --suffix=".even.px")"
+mini_png="$(mktemp tmp.XXXXXXXXXX.png)"
+colors_gif="$(mktemp tmp.XXXXXXXXXX.gif)"
+indexed_gif="$(mktemp tmp.XXXXXXXXXX.gif)"
+indexed_pgm="$(mktemp tmp.XXXXXXXXXX.pgm)"
+odd_lines="$(mktemp tmp.XXXXXXXXXX.odd)"
+even_lines="$(mktemp tmp.XXXXXXXXXX.even)"
+odd_lines_px="$(mktemp tmp.XXXXXXXXXX.odd.px)"
+even_lines_px="$(mktemp tmp.XXXXXXXXXX.even.px)"
 
 colors=(78,78,78 255,108,96 0,170,0 288,288,182 150,203,254 255,115,253 85,255,255 238,238,238 124,124,124 255,155,147 177,253,121 255,255,145 181,220,254 255,156,254 85,255,255 255,255,255)
 args=()
diff --git a/utils/gui-wrapper.sh b/utils/gui-wrapper.sh
index db0ba0b..29ff361 100755
--- a/utils/gui-wrapper.sh
+++ b/utils/gui-wrapper.sh
@@ -5,8 +5,8 @@ set -e
 resolution="$1" # e.g. 800x600x24 (width x height x bits_per_pixel)
 shift           # the following arguments are the program to execute and its arguments
 
-bg="$(mktemp --suffix='.xbm')"
-twm_cfg="$(mktemp --suffix='_twm.cfg')"
+bg="$(mktemp tmp.XXXXXXXXXX.xbm)"
+twm_cfg="$(mktemp tmp.XXXXXXXXXX_twm.cfg)"
 twm_session_dir="$(mktemp -d)"
 anim="$(mktemp -d)"
 
diff --git a/utils/make-travis-key.sh b/utils/make-travis-key.sh
index 38244b5..598162d 100755
--- a/utils/make-travis-key.sh
+++ b/utils/make-travis-key.sh
@@ -36,7 +36,7 @@ if ! which travis > /dev/null; then
   gem install travis || echo "Notice: you need the following packages or their equivalent: ruby ruby-dev"
 fi
 
-ssh_dir="$(mktemp -d --suffix=travis-deploy-ssh-keygen)"
+ssh_dir="$(mktemp -d tmp.XXXXXXXXXX_travis-deploy-ssh-keygen)"
 mkdir -m 700 "${ssh_dir}/permissions/"
 ssh-keygen -N '' -f "${ssh_dir}/permissions/travis-deploy-key-id_rsa"