[GRASS-SVN] r42145 - in grass/trunk: lib/init macosx/app

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2010-05-07 22:30:54 -0400 (Fri, 07 May 2010)
New Revision: 42145

Modified:
   grass/trunk/lib/init/grass.py
   grass/trunk/macosx/app/grass.sh.in
Log:
mac fixes: start new python init, fix user defined browser setting

Modified: grass/trunk/lib/init/grass.py
===================================================================
--- grass/trunk/lib/init/grass.py	2010-05-07 21:40:04 UTC (rev 42144)
+++ grass/trunk/lib/init/grass.py	2010-05-08 02:30:54 UTC (rev 42145)
@@ -342,10 +342,10 @@
 		    browser = b
 		    break
     
-    if macosx and browser:
+    elif macosx:
 	# OSX doesn't execute browsers from the shell PATH - route thru a script
+	os.environ['GRASS_HTML_BROWSER_MACOSX'] = "-b %s" % browser
 	browser = gfile('etc', "html_browser_mac.sh")
-	os.environ['GRASS_HTML_BROWSER_MACOSX'] = "-b com.apple.helpviewer"
 
     if not browser:
 	warning(_("Searched for a web browser, but none found"))

Modified: grass/trunk/macosx/app/grass.sh.in
===================================================================
--- grass/trunk/macosx/app/grass.sh.in	2010-05-07 21:40:04 UTC (rev 42144)
+++ grass/trunk/macosx/app/grass.sh.in	2010-05-08 02:30:54 UTC (rev 42145)
@@ -217,4 +217,4 @@
 	osascript -e "tell application \"$USERTERM\" to activate"
 fi
 
-exec "$GISBASE/etc/Init.sh" "$@"
+exec $GRASS_PYTHON "@BINDIR@/grass70.py" "$@" &
\ No newline at end of file