[GRASS-SVN] r45121 - grass/trunk/lib/init

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-01-20 14:41:05 -0800 (Thu, 20 Jan 2011)
New Revision: 45121

Modified:
   grass/trunk/lib/init/grass.py
   grass/trunk/lib/init/license.txt
Log:
there is only wxpython gui, simplify starting script


Modified: grass/trunk/lib/init/grass.py
===================================================================
--- grass/trunk/lib/init/grass.py	2011-01-20 22:36:43 UTC (rev 45120)
+++ grass/trunk/lib/init/grass.py	2011-01-20 22:41:05 UTC (rev 45121)
@@ -118,7 +118,7 @@
 help_text = r"""
 %s:
   $CMD_NAME [-h | -help | --help] [-v | --version] [-c]
-	  [-text | -gui | -wxpython | -wx]
+	  [-text | -gui]
 	  [[[<GISDBASE>/]<LOCATION_NAME>/]<MAPSET>]
 
 %s:
@@ -129,8 +129,6 @@
                                    %s
   -gui                           %s
                                    %s
-  -wxpython or -wx               %s
-                                   %s
 
 %s:
   GISDBASE                       %s
@@ -153,17 +151,15 @@
        _("create given mapset if it doesn't exist"),
        _("use text based interface"),
        _("and set as default"),
-       _("use graphical user interface ($DEFAULT_GUI by default)"),
+       _("use $DEFAULT_GUI graphical user interface"),
        _("and set as default"),
-       _("use wxPython based graphical user interface"),
-       _("and set as default"),
        _("Parameters"),
        _("initial database (path to GIS data)"),
        _("initial location"),
        _("initial mapset"),
        _("fully qualified initial mapset directory"),
        _("Environment variables relevant for startup"),
-       _("select GUI (text, gui, wxpython)"),
+       _("select GUI (text, gui)"),
        _("set wish shell name to override 'wish'"),
        _("set html web browser for help pages"),
        _("set additional path(s) to local GRASS modules"),
@@ -244,9 +240,7 @@
 
     if grass_gui == 'gui':
 	grass_gui = default_gui
-    elif grass_gui == 'wx':
-	grass_gui = 'wxpython'
-
+    
     # FIXME oldtcltk, gis.m, d.m no longer exist
     if grass_gui in ['d.m', 'gis.m', 'oldtcltk', 'tcltk']:
 	grass_gui = default_gui
@@ -829,7 +823,7 @@
     for i in sys.argv[1:]:
 	# Check if the user asked for the version
 	if i in ["-v","--version"]:
-	    message(readfile(gfile("etc", "license")))
+	    message('\n' + readfile(gfile("etc", "license")))
 	    sys.exit()
 	# Check if the user asked for help
 	elif i in ["help","-h","-help","--help"]:

Modified: grass/trunk/lib/init/license.txt
===================================================================
--- grass/trunk/lib/init/license.txt	2011-01-20 22:36:43 UTC (rev 45120)
+++ grass/trunk/lib/init/license.txt	2011-01-20 22:41:05 UTC (rev 45121)
@@ -1,9 +1,9 @@
 Geographic Resources Analysis Support System (GRASS) is Copyright,
-1999-2008 by the GRASS Development Team, and licensed under terms of the
+1999-GRASS_VERSION_DATE by the GRASS Development Team, and licensed under terms of the
 GNU General Public License (GPL) version >=2.
  
-This GRASS GRASS_VERSION_NUMBER release is coordinated and produced by the
-GRASS Development Team with contributions from all over the world.
+This GRASS GRASS_VERSION_NUMBER release is coordinated and produced by
+the GRASS Development Team with contributions from all over the world.
 
 This program is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of