Use a distribution-independent readlink invocation [EFForg#1504]

ErinCall · ErinCall · commit d9a235fe192b · 2015-06-11T13:22:41.000-07:00
The GNU and BSD versions of readlink assign different meanings to the -f
flag. By dropping -f we get a command that works the same on multiple
platforms.

Conflicts:
	locate-gnu-utils.sh
diff --git a/install-dev-dependencies.sh b/install-dev-dependencies.sh
@@ -7,7 +7,6 @@ if type apt-get >/dev/null ; then
     firefox chromium-browser zip sqlite3 python-pip libcurl4-openssl-dev
 elif type brew >/dev/null ; then
   brew list python &>/dev/null || brew install python
-  brew list coreutils &>/dev/null || brew install coreutils
   brew install libxml2 gnu-sed
   if ! echo $PATH | grep -ql /usr/local/bin ; then
     echo '/usr/local/bin not found in $PATH, please add it.'
diff --git a/locate-gnu-utils.sh b/locate-gnu-utils.sh
diff --git a/test.sh b/test.sh
@@ -1,11 +1,12 @@
 #!/bin/bash -ex
 # Run tests for HTTPS Everywhere
 
-source locate-gnu-utils.sh
+# 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))
 
-# 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
