[Monodevelop-patches-list] r1618 - trunk/MonoDevelop

[commit-watcher at mono-cvs.ximian.com]

Author: iainmc
Date: 2004-05-21 03:44:41 -0400 (Fri, 21 May 2004)
New Revision: 1618

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/monodevelop.in
Log:
make monodevelop.in more robust in cases where mozilla is not installed
	


Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2004-05-20 22:22:36 UTC (rev 1617)
+++ trunk/MonoDevelop/ChangeLog	2004-05-21 07:44:41 UTC (rev 1618)
@@ -1,3 +1,8 @@
+2004-05-21 Iain McCoy <iain at mccoy.id.au>
+
+	* monodevelop.in: make the script more robust in cases where
+	mozilla is not installed
+
 2004-05-06  Mike Kestner  <mkestner at ximian.com>
 
 	* configure.in : AC_SUBST the new BASE_DEPENDENCIES_LIBS

Modified: trunk/MonoDevelop/monodevelop.in
===================================================================
--- trunk/MonoDevelop/monodevelop.in	2004-05-20 22:22:36 UTC (rev 1617)
+++ trunk/MonoDevelop/monodevelop.in	2004-05-21 07:44:41 UTC (rev 1618)
@@ -4,8 +4,8 @@
 	MOZILLA_HOME=$MOZILLA_FIVE_HOME
 elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
         MOZILLA_HOME=@MOZILLA_HOME@
-elif cat `which mozilla` | grep MOZILLA_FIVE_HOME=; then
-	MOZILLA_HOME=$(cat $(which mozilla) | grep MOZILLA_FIVE_HOME= | cut -d '"' -f 2)
+elif $(which mozilla) && grep MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then
+	MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla) | cut -d '"' -f 2)
 else
 	echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
 	exit 1