[GRASS-SVN] r73978 - grass/branches/releasebranch_7_6/lib/init

[svn_grass at osgeo.org]

Author: neteler
Date: 2019-01-18 05:57:01 -0800 (Fri, 18 Jan 2019)
New Revision: 73978

Modified:
   grass/branches/releasebranch_7_6/lib/init/grass.py
Log:
grass.py: browser = "xdg-open" as fallback; no browser message spam in batch jobs; small help text wording and standardization (trunk, r73977)

Modified: grass/branches/releasebranch_7_6/lib/init/grass.py
===================================================================
--- grass/branches/releasebranch_7_6/lib/init/grass.py	2019-01-18 13:56:01 UTC (rev 73977)
+++ grass/branches/releasebranch_7_6/lib/init/grass.py	2019-01-18 13:57:01 UTC (rev 73978)
@@ -340,9 +340,9 @@
     create=_("create given database, location or mapset if it doesn't exist"),
     exit_after=_("exit after creation of location or mapset. Only with -c flag"),
     force_removal=_("force removal of .gislock if exists (use with care!). Only with --text flag"),
-    text=_("use text based interface (skip welcome screen)"),
+    text=_("use text based interface (skip graphical welcome screen)"),
     text_detail=_("and set as default"),
-    gtext=_("use text based interface (show welcome screen)"),
+    gtext=_("use text based interface (show graphical welcome screen)"),
     gtext_detail=_("and set as default"),
     gui=_("use $DEFAULT_GUI graphical user interface"),
     gui_detail=_("and set as default"),
@@ -349,7 +349,7 @@
     config=_("print GRASS configuration parameters"),
     config_detail=_("options: arch,build,compiler,path,revision,svn_revision,version"),
     params=_("Parameters"),
-    gisdbase=_("initial GRASS GIS database directory"),
+    gisdbase=_("initial GRASS database directory"),
     gisdbase_detail=_("directory containing Locations"),
     location=_("initial GRASS Location"),
     location_detail=_("directory containing Mapsets with one common coordinate system (projection)"),
@@ -726,10 +726,11 @@
         browser = gpath('etc', "html_browser_mac.sh")
 
     if not browser:
-        warning(_("Searched for a web browser, but none found"))
-        # even so we set konqueror to make lib/gis/parser.c happy:
-        # TODO: perhaps something more probable would be better, e.g. xdg-open
-        browser = "konqueror"
+        # no browser msg spam in batch jobs
+        if not grass_gui == 'text':
+            warning(_("Searched for a web browser, but none found"))
+        # even so we set to 'xdg-open' to make lib/gis/parser.c happy:
+        browser = "xdg-open"
 
     os.environ['GRASS_HTML_BROWSER'] = browser