Fix readlink errors & more properly CD to the project root.

semenko · semenko · commit d53222488237 · 2015-09-05T19:37:02.000-05:00
Signed-off-by: Nick Semenkovich &lt;semenko@alum.mit.edu&gt;
diff --git a/test.sh b/test.sh
@@ -3,10 +3,16 @@
 
 # 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.
+# test.sh before we can proceed.
 
-cd $(dirname $0)/$(dirname $(readlink $0))
+if [ -n "$GIT_DIR" ]
+then
+    # $GIT_DIR is set, so we're running as a hook.
+    cd $GIT_DIR
+else
+    # Git command exists? Cool, let's CD to the right place.
+    git rev-parse && cd "$(git rev-parse --show-toplevel)"
+fi
 
 ./test/rules.sh
 ./test/firefox.sh $@
diff --git a/test/chromium.sh b/test/chromium.sh
@@ -1,15 +1,16 @@
-#!/bin/bash
+#!/bin/bash -ex
 # Run Chromium tests for HTTPS Everywhere
-#
-# Get into the project-root. This script may be executed as `chromium.sh`
-# or as ./test/chromium.sh, so we need to find the directory
-# containing firefox.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.
 
-set -o errexit -o xtrace
+# Get to the repo root directory, even when we're symlinked as a hook.
+if [ -n "$GIT_DIR" ]
+then
+    # $GIT_DIR is set, so we're running as a hook.
+    cd $GIT_DIR
+else
+    # Git command exists? Cool, let's CD to the right place.
+    git rev-parse && cd "$(git rev-parse --show-toplevel)"
+fi
 
-cd $(dirname $0)/$(dirname $(readlink $0))../
 
 # If you just want to run Chromium with the latest code:
 if [ "$1" == "--justrun" ]; then
diff --git a/test/firefox.sh b/test/firefox.sh
@@ -1,12 +1,16 @@
 #!/bin/bash -ex
 # Run Firefox tests for HTTPS Everywhere
-#
-# Get into the project-root. This script may be executed as `firefox.sh`
-# or as ./test/firefox.sh, so we need to find the directory containing 
-# firefox.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))../
+# Get to the repo root directory, even when we're symlinked as a hook.
+if [ -n "$GIT_DIR" ]
+then
+    # $GIT_DIR is set, so we're running as a hook.
+    cd $GIT_DIR
+else
+    # Git command exists? Cool, let's CD to the right place.
+    git rev-parse && cd "$(git rev-parse --show-toplevel)"
+fi
+
 
 source utils/mktemp.sh
 
diff --git a/test/rules.sh b/test/rules.sh
@@ -1,10 +1,18 @@
-#!/bin/bash
+#!/bin/bash -ex
 #
 # Test that all rulesets modified after a certain date have sufficient test
 # coverage, according to the ruleset checker.
 #
 
-cd $(dirname $0)/$(dirname $(readlink $0))../
+# Get to the repo root directory, even when we're symlinked as a hook.
+if [ -n "$GIT_DIR" ]
+then
+    # $GIT_DIR is set, so we're running as a hook.
+    cd $GIT_DIR
+else
+    # Git command exists? Cool, let's CD to the right place.
+    git rev-parse && cd "$(git rev-parse --show-toplevel)"
+fi
 
 source utils/mktemp.sh
 
