* Minor fixup for Firefox 1.5
This commit is contained in:
parent
0ead8dad43
commit
a8446686be
2 changed files with 19 additions and 13 deletions
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.7 2005/11/02 18:00:13 thomasklausner Exp $
|
||||
# $NetBSD: Makefile,v 1.8 2006/04/16 23:52:29 poppnk Exp $
|
||||
|
||||
DISTNAME= firefox-wrapper-0.2
|
||||
DISTNAME= firefox-wrapper-0.3
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= # empty
|
||||
DISTFILES= # empty
|
||||
|
|
|
@ -8,24 +8,26 @@ if [ -e "${HOME}/.firefox-wrapper.conf" ]; then
|
|||
. ${HOME}/.firefox-wrapper.conf
|
||||
fi
|
||||
|
||||
if [ "${FIREFOX_BIN}" = "" ]; then
|
||||
if [ -z "${FIREFOX_BIN}" ]; then
|
||||
echo "Please define FIREFOX_BIN in _etc_/firefox-wrapper.conf"
|
||||
exit 1
|
||||
fi
|
||||
if [ "${OPEN_MODE}" = "" ]; then
|
||||
|
||||
if [ -z "${OPEN_MODE}" ]; then
|
||||
echo "Please define OPEN_MODE in _etc_/firefox-wrapper.conf"
|
||||
echo "Valid values are: 'new-window', 'new-tab', 'current'"
|
||||
exit 1
|
||||
fi
|
||||
if [ ! "${OPEN_MODE}" = "new-tab" ]; then
|
||||
if [ ! "${OPEN_MODE}" = "new-window" ]; then
|
||||
if [ ! "${OPEN_MODE}" = "current" ]; then
|
||||
|
||||
case "${OPEN_MODE}" in
|
||||
"new-tab"|"new-window"|"current")
|
||||
;;
|
||||
*)
|
||||
echo "Invalid value in OPEN_MODE"
|
||||
echo "Valid values are: 'new-window', 'new-tab', 'current'"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ ! -x ${FIREFOX_BIN} ]; then
|
||||
echo "${FIREFOX_BIN}: cannot execute."
|
||||
|
@ -36,10 +38,14 @@ fi
|
|||
${FIREFOX_BIN} -remote "ping()"
|
||||
|
||||
if [ "$?" = "0" ]; then # firefox is running
|
||||
if [ "${OPEN_MODE}" = "current" ]; then
|
||||
${FIREFOX_BIN} -remote "openURL($1)"
|
||||
if [ -z "$1" ]; then
|
||||
${FIREFOX_BIN}
|
||||
else
|
||||
${FIREFOX_BIN} -remote "openURL($1,${OPEN_MODE})"
|
||||
if [ "${OPEN_MODE}" = "current" ]; then
|
||||
${FIREFOX_BIN} -remote "openURL($1)"
|
||||
else
|
||||
${FIREFOX_BIN} -remote "openURL($1,${OPEN_MODE})"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
${FIREFOX_BIN} $1
|
||||
|
|
Loading…
Reference in a new issue