conduit r1671 - in trunk: . conduit

[jstowers svn gnome org]

Author: jstowers
Date: Fri Aug 22 01:03:17 2008
New Revision: 1671
URL: http://svn.gnome.org/viewvc/conduit?rev=1671&view=rev

Log:
	* conduit/conduit: Remove bashisms. Fixes #545464 (Christian Schlotter)


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/conduit/conduit

Modified: trunk/conduit/conduit
==============================================================================
--- trunk/conduit/conduit	(original)
+++ trunk/conduit/conduit	Fri Aug 22 01:03:17 2008
@@ -8,11 +8,11 @@
 # Run mozilla takes care of settin up the appropriate environment variables
 # to run a program using mozilla libs
 
-for d in `ls -d /usr/lib*/firefox* | sort -r`
+for d in `ls -d /usr/lib*/firefox* /usr/lib*/mozilla-firefox* 2> /dev/null | sort -r`
 do
     if [ -x $d/run-mozilla.sh ]; then
         echo INFO: FOUND FIREFOX LIBS AT $d
-        $d/run-mozilla.sh $(dirname $0)/conduit.real $*
+        $d/run-mozilla.sh `dirname $0`/conduit.real $*
         exit
     fi
 done
@@ -20,5 +20,5 @@
 echo "WARNING: COULD NOT FIND FIREFOX LIBRARIES"
 echo "WARNING: CONDUIT MAY CRASH UNEXPECTEDLY"
 echo "WARNING: PLEASE TALK TO THE PERSON WHO PACKAGED CONDUIT"
-$(dirname $0)/conduit.real $*
+`dirname $0`/conduit.real $*