[gentoo-commits] gentoo-src commit in mozilla-launcher: mozilla-launcher

[Raul Porcel (armin76)]

armin76     08/01/01 14:07:47

  Modified:             mozilla-launcher
  Log:
  Fix bug #178224, and bug #195726, remove mozilla stuff, fix copyright

Revision  Changes    Path
1.57                 mozilla-launcher/mozilla-launcher

file : http://sources.gentoo.org/viewcvs.py/gentoo-src/mozilla-launcher/mozilla-launcher?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-src/mozilla-launcher/mozilla-launcher?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-src/mozilla-launcher/mozilla-launcher?r1=1.56&r2=1.57

Index: mozilla-launcher
===================================================================
RCS file: /var/cvsroot/gentoo-src/mozilla-launcher/mozilla-launcher,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- mozilla-launcher	26 Dec 2006 10:10:55 -0000	1.56
+++ mozilla-launcher	1 Jan 2008 14:07:46 -0000	1.57
@@ -1,18 +1,18 @@
 #!/bin/bash
-# $Header: /var/cvsroot/gentoo-src/mozilla-launcher/mozilla-launcher,v 1.56 2006/12/26 10:10:55 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-src/mozilla-launcher/mozilla-launcher,v 1.57 2008/01/01 14:07:46 armin76 Exp $
 #
 # Portions of this file are extracted from the mozilla.org distributed scripts.
 # Those portions are Copyright (C) 1998 Netscape Communmications Corporation and
-# released under the NPL as detailed in /usr/lib/mozilla/mozilla,
-# /usr/lib/MozillaFirefox/firefox and /usr/lib/MozillaThunderbird/thunderbird.
+# released under the NPL as detailed in 
+# /usr/lib/mozilla-firefox/firefox and /usr/lib/mozilla-thunderbird/thunderbird.
 #
-# The remainder of this file is Copyright 1999-2005 Gentoo Foundation
+# The remainder of this file is Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 : ${MOZILLA_LAUNCHER_DEBUG:=false}
 
 # Make sure necessary progs are in the PATH
-PATH=/usr/bin:/bin:/usr/X11R6/bin:$PATH
+PATH=/usr/bin:/bin:$PATH
 unset GREP_OPTIONS
 
 main() {
@@ -133,31 +133,26 @@
     unset MOZILLA_LIBDIR
   fi
 
-  # Support mozilla, mozilla-bin, firefox, firefox-bin, thunderbird,
-  # thunderbird-bin!
+  # Support mozilla-firefox, mozilla-firefox-bin, mozilla-thunderbird,
+  # mozilla-thunderbird-bin, mozilla-sunbird, mozilla-sunbird-bin,
+  # xulrunner!
   # This case statement does the setup for source-based browsers and
   # just drops through for binary-based browsers.
   case $zero in
     *fox)
-      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaFirefox"}
+      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/mozilla-firefox"}
       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
       mozbin=$MOZILLA_FIVE_HOME/firefox-bin
       ;;
 
-    *mozilla)
-      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/mozilla"}
-      remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
-      mozbin=$MOZILLA_FIVE_HOME/mozilla-bin
-      ;;
-
     *sunbird)
-      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaSunbird"}
+      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/mozilla-sunbird"}
       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
       mozbin=$MOZILLA_FIVE_HOME/sunbird-bin
       ;;
 
     *thunderbird)
-      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaThunderbird"}
+      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/mozilla-thunderbird"}
       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
       mozbin=$MOZILLA_FIVE_HOME/thunderbird-bin
       ;;
@@ -197,12 +192,6 @@
       mozbin=$MOZILLA_FIVE_HOME/firefox-bin
       ;;
 
-    *mozilla-bin)
-      export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/opt/mozilla"}
-      remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
-      mozbin=$MOZILLA_FIVE_HOME/mozilla-bin
-      ;;
-
     *sunbird-bin)
       export MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/opt/sunbird"}
       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
@@ -408,6 +397,7 @@
   # than the current one.  http://bugs.gentoo.org/show_bug.cgi?id=59849
   f=$(find ~/{.,.mozilla/}${zero%-bin} ! -uid ${EUID} 2>/dev/null | head -n10)
   if [[ -n ${f} ]]; then
+    [[ ${zero} == "thunderbird" ]] && hint="thunderbird" || hint="mozilla"
     cat <<EOF
 Error launching ${zero}:
 
@@ -419,7 +409,7 @@
     (( $(echo "${f}" | wc -l) == 10 )) && echo "    ..."
     echo
     echo "You can fix this problem by running the following:"
-    echo "    su -c 'chown -R $(id -un):$(id -gn) $HOME/.mozilla'"
+    echo "    su -c 'chown -R $(id -un):$(id -gn) $HOME/.${hint}'"
     echo
     return 101
   fi >&2
@@ -536,14 +526,9 @@
     return 1
   fi
 
-  # mozilla (seamonkey) doesn't support -register yet.  Until it does, use the
-  # mozilla-rebuild-databases.pl script instead
-  if [[ ${zero} == mozilla ]]; then
-    echo "Running mozilla-rebuild-databases.pl"
-    umask 022
-    ${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
-    return $?
-  elif [[ ${zero} == seamonkey ]]; then
+  # seamonkey doesn't support -register yet.  Until it does, use the
+  # seamonkey-rebuild-databases.pl script instead
+  if [[ ${zero} == seamonkey ]]; then
     echo "Running seamonkey-rebuild-databases.pl"
     umask 022
     ${MOZILLA_FIVE_HOME}/seamonkey-rebuild-databases.pl
@@ -612,8 +597,8 @@
 
 sanitize_url()
 {
-  # We only really need to filter '(', ')' and ',' as these break openURL
-  echo $1 | sed -e's/,/%2c/g' -e's/(/%28/g' -e's/)/%29/g'
+  # We only really need to filter '(' and ')' as these break openURL
+  echo $1 | sed -e's/(/%28/g' -e's/)/%29/g'
 }
 
 # Call the main sub, which is defined at the top of this script



-- 
gentoo-commits@g.o mailing list