[patch] mozilla-launcher.diff

mozilla-launcher.diff (text/plain), 3.25 KB, created by Martin von Gagern on 2005-07-19 04:54:28 UTC

]0;ssh valhalla diff -u /usr/libexec/mozilla-launcher.orig /usr/libexec/mozilla-launcher--- /usr/libexec/mozilla-launcher.orig	2005-07-19 13:30:02.127197616 +0200
+++ /usr/libexec/mozilla-launcher	2005-07-19 13:39:12.416540920 +0200
@@ -124,10 +124,8 @@
 which_browser() {
   # Newer launcher stubs will set MOZILLA_LIBDIR so that the installation
   # location is controlled by the ebuild rather than mozilla-launcher, finally!
-  if [[ -n $MOZILLA_LIBDIR && -d $MOZILLA_LIBDIR ]]; then
-    export MOZILLA_FIVE_HOME=$MOZILLA_LIBDIR
-  else
-    export MOZILLA_FIVE_HOME='' # set below
+  if [[ ! -d $MOZILLA_LIBDIR ]]; then
+    MOZILLA_LIBDIR=''
   fi
 
   # Support mozilla, mozilla-bin, firefox, firefox-bin, thunderbird,
@@ -136,28 +134,28 @@
   # just drops through for binary-based browsers.
   case $zero in
     *fox)
-      : ${MOZILLA_FIVE_HOME:="/usr/lib/MozillaFirefox"}
+      MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaFirefox"}
       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
       mozbin=$MOZILLA_FIVE_HOME/firefox-bin
       grepfor=Firefox-bin
       ;;
 
     *mozilla)
-      : ${MOZILLA_FIVE_HOME:="/usr/lib/mozilla"}
+      MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/mozilla"}
       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
       mozbin=$MOZILLA_FIVE_HOME/mozilla-bin
       grepfor=Mozilla-bin
       ;;
 
     *sunbird)
-      : ${MOZILLA_FIVE_HOME:="/usr/lib/MozillaSunbird"}
+      MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaSunbird"}
       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
       mozbin=$MOZILLA_FIVE_HOME/sunbird-bin
       grepfor=Sunbird-bin
       ;;
 
     *thunderbird)
-      : ${MOZILLA_FIVE_HOME:="/usr/lib/MozillaThunderbird"}
+      MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaThunderbird"}
       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
       mozbin=$MOZILLA_FIVE_HOME/thunderbird-bin
       grepfor=Thunderbird-bin
@@ -181,28 +179,28 @@
 
   case $zero in
     *fox-bin)
-      : ${MOZILLA_FIVE_HOME:="/opt/firefox"}
+      MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/opt/firefox"}
       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
       mozbin=$MOZILLA_FIVE_HOME/firefox-bin
       grepfor=Firefox-bin
       ;;
 
     *mozilla-bin)
-      : ${MOZILLA_FIVE_HOME:="/opt/mozilla"}
+      MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/opt/mozilla"}
       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
       mozbin=$MOZILLA_FIVE_HOME/mozilla-bin
       grepfor=Mozilla-bin
       ;;
 
     *sunbird-bin)
-      : ${MOZILLA_FIVE_HOME:="/opt/sunbird"}
+      MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/opt/sunbird"}
       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
       mozbin=$MOZILLA_FIVE_HOME/sunbird-bin
       grepfor=Sunbird-bin
       ;;
 
     *thunderbird-bin)
-      : ${MOZILLA_FIVE_HOME:="/opt/thunderbird"}
+      MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/opt/thunderbird"}
       remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
       mozbin=$MOZILLA_FIVE_HOME/thunderbird-bin
       grepfor=Thunderbird-bin
@@ -223,6 +221,9 @@
       && progname=Thunderbird
   fi
 
+  # also export MOZILLA_FIVE_HOME
+  export MOZILLA_FIVE_HOME
+
   # Set LD_LIBRARY_PATH (also set in /etc/env.d/10*)
   export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/plugins${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}