SOURCES: mozilla-firefox.sh, mozilla-thunderbird.sh - MOZILLA_FIVE...

[glen]

Author: glen                         Date: Sat Oct 27 21:52:33 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- MOZILLA_FIVE_HOME is compiled in

---- Files affected:
SOURCES:
   mozilla-firefox.sh (1.16 -> 1.17) , mozilla-thunderbird.sh (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/mozilla-firefox.sh
diff -u SOURCES/mozilla-firefox.sh:1.16 SOURCES/mozilla-firefox.sh:1.17
--- SOURCES/mozilla-firefox.sh:1.16	Tue Feb  6 22:55:34 2007
+++ SOURCES/mozilla-firefox.sh	Sat Oct 27 23:52:28 2007
@@ -3,15 +3,13 @@
 
 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
 	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
@@ -22,7 +20,7 @@
 	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//')

================================================================
Index: SOURCES/mozilla-thunderbird.sh
diff -u SOURCES/mozilla-thunderbird.sh:1.2 SOURCES/mozilla-thunderbird.sh:1.3
--- SOURCES/mozilla-thunderbird.sh:1.2	Fri Mar  3 20:57:24 2006
+++ SOURCES/mozilla-thunderbird.sh	Sat Oct 27 23:52:28 2007
@@ -1,7 +1,7 @@
 #!/bin/sh
 # based on script by (c) vip at linux.pl, wolf at pld-linux.org
 
-MOZILLA_FIVE_HOME="@LIBDIR@/mozilla-thunderbird"
+LIBDIR="@LIBDIR@/mozilla-firefox"
 
 MOZARGS=
 MOZLOCALE="$(/usr/bin/locale | grep "^LC_MESSAGES=" | \
@@ -9,7 +9,7 @@
 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
@@ -31,9 +31,9 @@
 fi
 
 if [ -n "$MOZARGS" ]; then
-	THUNDERBIRD="$MOZILLA_FIVE_HOME/thunderbird $MOZARGS"
+	THUNDERBIRD="$LIBDIR/thunderbird $MOZARGS"
 else
-	THUNDERBIRD="$MOZILLA_FIVE_HOME/thunderbird"
+	THUNDERBIRD="$LIBDIR/thunderbird"
 fi
 
 if [ "$1" == "-remote" ]; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mozilla-firefox.sh?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mozilla-thunderbird.sh?r1=1.2&r2=1.3&f=u