Merge pull request EFForg#1714 from ErinCall/bsd-utils-compatibility

jsha · jsha · commit ffe91bef06c6 · 2015-06-17T12:36:16.000-07:00
Fix shell scripts for BSD-ish systems
diff --git a/run-chromium.sh b/run-chromium.sh
@@ -3,8 +3,12 @@
 # Build the extension and run a chromium extension with it installed.
 #
 set -o errexit -o xtrace
+
 cd $(dirname $0)
+
 source makecrx.sh
+source utils/mktemp.sh
+
 PROFILE_DIRECTORY="$(mktemp -d)"
 trap 'rm -r "$PROFILE_DIRECTORY"' EXIT
 chromium-browser \
diff --git a/test-ruleset-coverage.sh b/test-ruleset-coverage.sh
@@ -3,8 +3,12 @@
 # Test that all rulesets modified after a certain date have sufficient test
 # coverage, according to the ruleset checker.
 #
+
 cd $(dirname $0)
-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
@@ -1,9 +1,13 @@
 #!/bin/bash -ex
 # Run tests for HTTPS Everywhere
 
-# 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))
+# Get into the project-root. This script may be executed as `test.sh`
+# or as .git/hooks/pre-push, so we need to find the directory containing
+# test.sh before we can proceed. If $0 is not a symlink, `readlink` will
+# print nothing; if it is a symlink it will print the link target.
+cd $(dirname $0)/$(dirname $(readlink $0))
+
+source utils/mktemp.sh
 
 # dummy Jetpack addon that contains tests
 TEST_ADDON_PATH=./https-everywhere-tests/
@@ -65,4 +69,5 @@ bash test-ruleset-coverage.sh
 echo "To reproduce this build (https://wiki.debian.org/ReproducibleBuilds)," \
      "please use this version of sqlite3:"
 sqlite3 -version
-echo -e "Git commit `git rev-parse HEAD`\nsha256sum  `sha256sum $XPI_NAME`"
+shasum=$(openssl sha -sha256 "$XPI_NAME")
+echo -e "Git commit `git rev-parse HEAD`\n$shasum"
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 $@
+}
