Use a distribution-independent mktemp command [EFForg#1504]

ErinCall · ErinCall · commit a7365174770f · 2015-06-11T13:22:41.000-07:00
GNU and BSD mktemp have slightly different invocations; using a $MKTEMP
command everywhere ensures a safe invocation.
diff --git a/locate-gnu-utils.sh b/locate-gnu-utils.sh
@@ -11,13 +11,6 @@ if [ -x "$GREADLINK" ]; then
 fi
 unset GREADLINK
 
-MKTEMP=$(which mktemp 2>/dev/null || true)
-GMKTEMP=$(which gmktemp 2>/dev/null || true)
-if [ -x "$GMKTEMP" ]; then
-  MKTEMP="$GMKTEMP"
-fi
-unset GMKTEMP
-
 check_for_gnu_version() {
   gnu_available=$("$1" --version 2>&1 | grep GNU)
   if [ ! "$gnu_available" ]; then
@@ -29,5 +22,4 @@ check_for_gnu_version() {
   fi
 }
 
-check_for_gnu_version "$MKTEMP" "mktemp"
 check_for_gnu_version "$READLINK" "readlink"
diff --git a/run-chromium.sh b/run-chromium.sh
@@ -5,9 +5,11 @@
 set -o errexit -o xtrace
 
 cd $(dirname $0)
-source locate-gnu-utils.sh
+
 source makecrx.sh
-PROFILE_DIRECTORY="$("$MKTEMP" -d)"
+source utils/mktemp.sh
+
+PROFILE_DIRECTORY="$(mktemp -d)"
 trap 'rm -r "$PROFILE_DIRECTORY"' EXIT
 chromium-browser \
   --user-data-dir="$PROFILE_DIRECTORY" \
diff --git a/test-ruleset-coverage.sh b/test-ruleset-coverage.sh
@@ -5,8 +5,10 @@
 #
 
 cd $(dirname $0)
-source locate-gnu-utils.sh
-TMP=`"$MKTEMP"`
+
+source utils/mktemp.sh
+
+TMP="$(mktemp)"
 trap 'rm "$TMP"' EXIT
 if ! [ -d https-everywhere-checker ] ; then
   echo "Submodule https-everywhere-checker is missing. Run"
diff --git a/test.sh b/test.sh
@@ -6,12 +6,13 @@ source locate-gnu-utils.sh
 # We have to change to the right directory because this is sometimes invoked
 # through a symlink in .git/hooks/pre-push.
 cd $(dirname $("$READLINK" -f $0))
+source utils/mktemp.sh
 
 # dummy Jetpack addon that contains tests
 TEST_ADDON_PATH=./https-everywhere-tests/
 
 # We'll create a Firefox profile here and install HTTPS Everywhere into it.
-PROFILE_DIRECTORY="$("$MKTEMP" -d)"
+PROFILE_DIRECTORY="$(mktemp -d)"
 trap 'rm -r "$PROFILE_DIRECTORY"' EXIT
 HTTPSE_INSTALL_DIRECTORY=$PROFILE_DIRECTORY/extensions/https-everywhere@eff.org
 
diff --git a/utils/mktemp.sh b/utils/mktemp.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# BSD and GNU mktemp have slightly different invocation patterns.
+# BSD's needs a -t option specifying a "template." 'everywhere' will
+# end up in the temp-folder name, so in the event it doesn't get cleaned
+# up, there's some indication of where it originated.
+
+MKTEMP=`which mktemp`
+function mktemp() {
+    $MKTEMP $@ 2>/dev/null || $MKTEMP -t everywhere $@
+}
