Attachment #63770 for bug #99512

View | Details | Raw Unified | Return to bug 99512
Collapse All | Expand All




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 [[ ! -d $MOZILLA_LIBDIR ]]; then
    MOZILLA_LIBDIR=''
  else
    export MOZILLA_FIVE_HOME='' # set below
  fi

  # Support mozilla, mozilla-bin, firefox, firefox-bin, thunderbird,

  # just drops through for binary-based browsers.
  case $zero in
    *fox)
      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=${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=${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=${MOZILLA_LIBDIR:-"/usr/lib/MozillaThunderbird"}
      remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
      mozbin=$MOZILLA_FIVE_HOME/thunderbird-bin
      grepfor=Thunderbird-bin


  case $zero in
    *fox-bin)
      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=${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=${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=${MOZILLA_LIBDIR:-"/opt/thunderbird"}
      remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
      mozbin=$MOZILLA_FIVE_HOME/thunderbird-bin
      grepfor=Thunderbird-bin

      && 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}


Return to bug 99512

Lines 124-133 Link Here

(-) (-12 / +13 lines)
124	which_browser() {	124	which_browser() {
125	# Newer launcher stubs will set MOZILLA_LIBDIR so that the installation	125	# Newer launcher stubs will set MOZILLA_LIBDIR so that the installation
126	# location is controlled by the ebuild rather than mozilla-launcher, finally!	126	# location is controlled by the ebuild rather than mozilla-launcher, finally!
127	if [[ -n $MOZILLA_LIBDIR && -d $MOZILLA_LIBDIR ]]; then	127	if [[ ! -d $MOZILLA_LIBDIR ]]; then
128	export MOZILLA_FIVE_HOME=$MOZILLA_LIBDIR	128	MOZILLA_LIBDIR=''
129	else
130	export MOZILLA_FIVE_HOME='' # set below
131	fi	129	fi
132		130
133	# Support mozilla, mozilla-bin, firefox, firefox-bin, thunderbird,	131	# Support mozilla, mozilla-bin, firefox, firefox-bin, thunderbird,
Lines 136-163 Link Here
136	# just drops through for binary-based browsers.	134	# just drops through for binary-based browsers.
137	case $zero in	135	case $zero in
138	*fox)	136	*fox)
139	: ${MOZILLA_FIVE_HOME:="/usr/lib/MozillaFirefox"}	137	MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaFirefox"}
140	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client	138	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
141	mozbin=$MOZILLA_FIVE_HOME/firefox-bin	139	mozbin=$MOZILLA_FIVE_HOME/firefox-bin
142	grepfor=Firefox-bin	140	grepfor=Firefox-bin
143	;;	141	;;
144		142
145	*mozilla)	143	*mozilla)
146	: ${MOZILLA_FIVE_HOME:="/usr/lib/mozilla"}	144	MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/mozilla"}
147	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client	145	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
148	mozbin=$MOZILLA_FIVE_HOME/mozilla-bin	146	mozbin=$MOZILLA_FIVE_HOME/mozilla-bin
149	grepfor=Mozilla-bin	147	grepfor=Mozilla-bin
150	;;	148	;;
151		149
152	*sunbird)	150	*sunbird)
153	: ${MOZILLA_FIVE_HOME:="/usr/lib/MozillaSunbird"}	151	MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaSunbird"}
154	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client	152	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
155	mozbin=$MOZILLA_FIVE_HOME/sunbird-bin	153	mozbin=$MOZILLA_FIVE_HOME/sunbird-bin
156	grepfor=Sunbird-bin	154	grepfor=Sunbird-bin
157	;;	155	;;
158		156
159	*thunderbird)	157	*thunderbird)
160	: ${MOZILLA_FIVE_HOME:="/usr/lib/MozillaThunderbird"}	158	MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/usr/lib/MozillaThunderbird"}
161	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client	159	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
162	mozbin=$MOZILLA_FIVE_HOME/thunderbird-bin	160	mozbin=$MOZILLA_FIVE_HOME/thunderbird-bin
163	grepfor=Thunderbird-bin	161	grepfor=Thunderbird-bin
Lines 181-208 Link Here
181		179
182	case $zero in	180	case $zero in
183	*fox-bin)	181	*fox-bin)
184	: ${MOZILLA_FIVE_HOME:="/opt/firefox"}	182	MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/opt/firefox"}
185	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client	183	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
186	mozbin=$MOZILLA_FIVE_HOME/firefox-bin	184	mozbin=$MOZILLA_FIVE_HOME/firefox-bin
187	grepfor=Firefox-bin	185	grepfor=Firefox-bin
188	;;	186	;;
189		187
190	*mozilla-bin)	188	*mozilla-bin)
191	: ${MOZILLA_FIVE_HOME:="/opt/mozilla"}	189	MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/opt/mozilla"}
192	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client	190	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
193	mozbin=$MOZILLA_FIVE_HOME/mozilla-bin	191	mozbin=$MOZILLA_FIVE_HOME/mozilla-bin
194	grepfor=Mozilla-bin	192	grepfor=Mozilla-bin
195	;;	193	;;
196		194
197	*sunbird-bin)	195	*sunbird-bin)
198	: ${MOZILLA_FIVE_HOME:="/opt/sunbird"}	196	MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/opt/sunbird"}
199	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client	197	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
200	mozbin=$MOZILLA_FIVE_HOME/sunbird-bin	198	mozbin=$MOZILLA_FIVE_HOME/sunbird-bin
201	grepfor=Sunbird-bin	199	grepfor=Sunbird-bin
202	;;	200	;;
203		201
204	*thunderbird-bin)	202	*thunderbird-bin)
205	: ${MOZILLA_FIVE_HOME:="/opt/thunderbird"}	203	MOZILLA_FIVE_HOME=${MOZILLA_LIBDIR:-"/opt/thunderbird"}
206	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client	204	remote=$MOZILLA_FIVE_HOME/mozilla-xremote-client
207	mozbin=$MOZILLA_FIVE_HOME/thunderbird-bin	205	mozbin=$MOZILLA_FIVE_HOME/thunderbird-bin
208	grepfor=Thunderbird-bin	206	grepfor=Thunderbird-bin
Lines 223-228 Link Here
223	&& progname=Thunderbird	221	&& progname=Thunderbird
224	fi	222	fi
225		223
		224	# also export MOZILLA_FIVE_HOME
		225	export MOZILLA_FIVE_HOME
		226
226	# Set LD_LIBRARY_PATH (also set in /etc/env.d/10*)	227	# Set LD_LIBRARY_PATH (also set in /etc/env.d/10*)
227	export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/plugins${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}	228	export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/plugins${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
228		229