Browse Source

mac fixes: start new python init, fix user defined browser setting

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@42145 15284696-431f-4ddb-bdfa-cd5b030d7da7
William Kyngesburye 15 years ago
parent
commit
b4e8d2c31f
2 changed files with 3 additions and 3 deletions
  1. 2 2
      lib/init/grass.py
  2. 1 1
      macosx/app/grass.sh.in

+ 2 - 2
lib/init/grass.py

@@ -342,10 +342,10 @@ def set_browser():
 		    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"))

+ 1 - 1
macosx/app/grass.sh.in

@@ -217,4 +217,4 @@ if [ "$GRASS_GUI" = "text" ] && [ "$x11" = "tig" ] ; then
 	osascript -e "tell application \"$USERTERM\" to activate"
 fi
 
-exec "$GISBASE/etc/Init.sh" "$@"
+exec $GRASS_PYTHON "@BINDIR@/grass70.py" "$@" &