- rel 2

[packages/firefox.git] / mozilla-firefox.sh

diff --git a/mozilla-firefox.sh b/mozilla-firefox.sh
index f9b1cff0bc262211095a9ea3cc795f0553e88644..6e13f69d17cb7b16a25405c1afb1c5dbc09d9266 100644 (file)
--- a/mozilla-firefox.sh
+++ b/mozilla-firefox.sh
@@ -1,14 +1,11 @@
 #!/bin/sh
 # based on script by (c) vip at linux.pl, wolf at pld-linux.org
 
-if [ `arch` == "x86_64" ]; then
-       LIBDIR="/usr/lib64/mozilla-firefox"
-else
-       LIBDIR="/usr/lib/mozilla-firefox"
-fi
+LIBDIR="@LIBDIR@/mozilla-firefox"
 
 MOZILLA_FIVE_HOME=$LIBDIR
 
+MOZARGS=
 MOZLOCALE="$(/usr/bin/locale | grep "^LC_MESSAGES=" | \
                sed -e "s|LC_MESSAGES=||g" -e "s|\"||g" )"
 for MOZLANG in $(echo $LANGUAGE | tr ":" " ") $MOZLOCALE; do
@@ -73,11 +70,11 @@ else
                        else
                                URL="$1"
                        fi
-                       grep browser.tabs.opentabfor.middleclick ~/.mozilla/firefox/*/prefs.js | grep true > /dev/null
-                       if [ 0 -eq 0 ]; then
-                               exec $FIREFOX -remote "OpenUrl($URL,new-tab)"
+                       grep browser.tabs.opentabfor.middleclick ~/.mozilla/firefox/*/prefs.js | grep false > /dev/null
+                       if [ $? -ne 0 ]; then
+                               exec $FIREFOX -new-tab "$URL"
                        else
-                               exec $FIREFOX -remote "OpenUrl($URL,new-window)"
+                               exec $FIREFOX -new-window "$URL"
                        fi
                fi
        fi