- update to 3.0.3 (fixes problem with saved passwords)

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

diff --git a/mozilla-firefox.sh b/mozilla-firefox.sh
index f9b1cff0bc262211095a9ea3cc795f0553e88644..9fd7160e35ff0df808772e9e7081bc30b3e48ada 100644 (file)
--- a/mozilla-firefox.sh
+++ b/mozilla-firefox.sh
@@ -1,20 +1,15 @@
 #!/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
-
-MOZILLA_FIVE_HOME=$LIBDIR
+LIBDIR="@LIBDIR@/mozilla-firefox"
 
+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
        eval MOZLANG="$(echo $MOZLANG | sed -e "s|_\([^.]*\).*|-\1|g")"
 
-       if [ -f $MOZILLA_FIVE_HOME/chrome/$MOZLANG.jar ]; then
+       if [ -f $LIBDIR/chrome/$MOZLANG.jar ]; then
                MOZARGS="-UILocale $MOZLANG"
                break
        fi
@@ -25,7 +20,7 @@ if [ -z "$MOZARGS" ]; then
        for MOZLANG in $(echo $LANGUAGE | tr ":" " ") $MOZLOCALE; do
                eval MOZLANG="$(echo $MOZLANG | sed -e "s|_.*||g")"
 
-               LANGFILE=$(echo ${MOZILLA_FIVE_HOME}/chrome/${MOZLANG}*.jar \
+               LANGFILE=$(echo $LIBDIR/chrome/${MOZLANG}*.jar \
                                | sed 's/\s.*//g' )
                if [ -f "$LANGFILE" ]; then
                        MOZLANG=$(basename "$LANGFILE" | sed 's/\.jar//')
@@ -73,11 +68,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