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