|
|
@@ -24,8 +24,8 @@
|
|
|
##
|
|
|
|
|
|
# configuration
|
|
|
-mozilla_dir="@l_prefix@/lib/firefox"
|
|
|
-mozilla_bin="@l_prefix@/lib/firefox/mozilla"
|
|
|
+firefox_dir="@l_prefix@/lib/firefox"
|
|
|
+firefox_bin="@l_prefix@/lib/firefox/firefox"
|
|
|
xsel_bin="@l_prefix@/bin/xsel"
|
|
|
|
|
|
# option parsing
|
|
|
@@ -54,19 +54,19 @@ verbose () {
|
|
|
}
|
|
|
|
|
|
# establish Mozilla environment
|
|
|
-MOZILLA_FIVE_HOME="$mozilla_dir"
|
|
|
+MOZILLA_FIVE_HOME="$firefox_dir"
|
|
|
export MOZILLA_FIVE_HOME
|
|
|
LANG=en_US.ISO8859-1
|
|
|
export LANG
|
|
|
|
|
|
# special case of direct remote option
|
|
|
if [ ".$opt_r" != . ]; then
|
|
|
- verbose "exec: $mozilla_bin -remote \"$opt_r\""
|
|
|
- exec $mozilla_bin -remote "$opt_r"
|
|
|
+ verbose "exec: $firefox_bin -remote \"$opt_r\""
|
|
|
+ exec $firefox_bin -remote "$opt_r"
|
|
|
fi
|
|
|
|
|
|
# determine Mozilla run-time status
|
|
|
-$mozilla_bin -remote "ping()" >/dev/null 2>&1
|
|
|
+$firefox_bin -remote "ping()" >/dev/null 2>&1
|
|
|
if [ $? -eq 0 ]; then
|
|
|
verbose "process already running (available remotely)"
|
|
|
restart=no
|
|
|
@@ -152,11 +152,11 @@ for url in "$@"; do
|
|
|
# handling of first URL if restarting is necessary
|
|
|
verbose "running new process"
|
|
|
if [ ".$url" = ".about:blank" ]; then
|
|
|
- verbose "exec: $mozilla_bin >/dev/null 2>&1 &"
|
|
|
- $mozilla_bin >/dev/null 2>&1 &
|
|
|
+ verbose "exec: $firefox_bin >/dev/null 2>&1 &"
|
|
|
+ $firefox_bin >/dev/null 2>&1 &
|
|
|
else
|
|
|
- verbose "exec: $mozilla_bin \"$url\" >/dev/null 2>&1 &"
|
|
|
- $mozilla_bin "$url" >/dev/null 2>&1 &
|
|
|
+ verbose "exec: $firefox_bin \"$url\" >/dev/null 2>&1 &"
|
|
|
+ $firefox_bin "$url" >/dev/null 2>&1 &
|
|
|
fi
|
|
|
else
|
|
|
# delayed waiting for process to be finally remotely available
|
|
|
@@ -168,7 +168,7 @@ for url in "$@"; do
|
|
|
sleep 4 # give it a little bit of time to fully startup
|
|
|
i=0
|
|
|
while [ $i -lt 10 ]; do
|
|
|
- $mozilla_bin -remote "ping()" >/dev/null 2>&1
|
|
|
+ $firefox_bin -remote "ping()" >/dev/null 2>&1
|
|
|
if [ $? -eq 0 ]; then
|
|
|
break
|
|
|
fi
|
|
|
@@ -192,8 +192,8 @@ for url in "$@"; do
|
|
|
|
|
|
# perform remote command
|
|
|
verbose "sending remote command to running process"
|
|
|
- verbose "exec: $mozilla_bin -remote \"$cmd\" >/dev/null 2>&1"
|
|
|
- $mozilla_bin -remote "$cmd" >/dev/null 2>&1
|
|
|
+ verbose "exec: $firefox_bin -remote \"$cmd\" >/dev/null 2>&1"
|
|
|
+ $firefox_bin -remote "$cmd" >/dev/null 2>&1
|
|
|
fi
|
|
|
first=no
|
|
|
done
|