diff options
| -rwxr-xr-x | configure | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -17,11 +17,9 @@ set -e # Set BROWSERPATH appropriately set_browserpath () { - BROWSERPATH="${BINARY:-$(realpath "$1")}" + BROWSERPATH="${BROWSERPATH:-$(realpath "$1")}" } -BINARY="$BROWSER_BIN" -BROWSERPATH='' SRCDIR='' TARGET='' @@ -30,10 +28,11 @@ while [ "x$1" != x ]; do case "$1" in --srcdir=*) SRCDIR="$(echo "$1" | cut -c 10-)";; --srcdir) SRCDIR="$2"; shift;; - BROWSER_BIN=*) BINARY="$(echo "$1" | cut -c 13-)";; + BROWSER=*) BROWSERPATH="$(echo "$1" | cut -c 9-)";; DESTDIR=*) DESTDIR="$(echo "$1" | cut -c 9-)";; PYTEST=*) PYTEST="$(echo "$1" | cut -c 8-)";; PYTHON=*) PYTHON="$(echo "$1" | cut -c 8-)";; + TEST_BROWSER=*) TEST_BROWSER="$(echo "$1" | cut -c 14-)";; TEST_PORT=*) TEST_PORT="$(echo "$1" | cut -c 11-)";; TEST_PROFILE=*) TEST_PROFILE="$(echo "$1" | cut -c 14-)";; UPDATE_URL=*) UPDATE_URL="$(echo "$1" | cut -c 12-)";; @@ -81,6 +80,8 @@ else set_browserpath "$(which $TARGET)" fi +TEST_BROWSER="${TEST_BROWSER:-$BROWSERPATH}" + # Check and standardize target case "$TARGET" in mozilla | firefox | abrowser | icecat | iceweasel-uxp |\ @@ -115,7 +116,7 @@ echo UPDATE_URL = "$UPDATE_URL" >> record.conf # (Re-)write testing.conf rm -f testing.conf -[ "x$BINARY" != x ] && echo BINARY "$BINARY" >> testing.conf +[ "x$TEST_BROWSER" != x ] && echo BINARY "$TEST_BROWSER" >> testing.conf [ "x$TEST_PROFILE" != x ] && echo TEST_PROFILE "$TEST_PROFILE" >> testing.conf [ "x$TEST_PORT" != x ] && echo TEST_PORT "$TEST_PORT" >> testing.conf |