[GRASS-SVN] r64362 - grass/branches/releasebranch_7_0/lib/init

[svn_grass at osgeo.org]

Author: neteler
Date: 2015-01-30 04:04:36 -0800 (Fri, 30 Jan 2015)
New Revision: 64362

Modified:
   grass/branches/releasebranch_7_0/lib/init/grass.py
   grass/branches/releasebranch_7_0/lib/init/license.txt
Log:
grass.py: show version with --version; minor cosmetics

Modified: grass/branches/releasebranch_7_0/lib/init/grass.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/init/grass.py	2015-01-30 12:03:53 UTC (rev 64361)
+++ grass/branches/releasebranch_7_0/lib/init/grass.py	2015-01-30 12:04:36 UTC (rev 64362)
@@ -17,7 +17,7 @@
 #               command line options for setting the GISDBASE, LOCATION,
 #               and/or MAPSET. Finally it starts GRASS with the appropriate
 #               user interface and cleans up after it is finished.
-# COPYRIGHT:    (C) 2000-2014 by the GRASS Development Team
+# COPYRIGHT:    (C) 2000-2015 by the GRASS Development Team
 #
 #               This program is free software under the GNU General
 #               Public License (>=v2). Read the file COPYING that
@@ -998,7 +998,7 @@
 
 
 def say_hello():
-    sys.stderr.write(_("Welcome to GRASS %s") % grass_version)
+    sys.stderr.write(_("Welcome to GRASS GIS %s") % grass_version)
     if grass_version.endswith('svn'):
         try:
             filerev = open(os.path.join(gisbase, 'etc', 'VERSIONNUMBER'))
@@ -1017,7 +1017,7 @@
 %-41s%s (%s)
 %-41sg.manual -i
 %-41sg.version -c
-""" % (_("GRASS homepage:"),
+""" % (_("GRASS GIS homepage:"),
        _("This version running through:"),
        shellname, os.getenv('SHELL'),
        _("Help is available with the command:"),
@@ -1052,7 +1052,7 @@
 
     f.write("set prompt = '\\\n")
     f.write("Mapset <%s> in Location <%s> \\\n" % (mapset, location_name))
-    f.write("GRASS %s > '\n" % grass_version)
+    f.write("GRASS GIS %s > '\n" % grass_version)
     f.write("set BOGUS=``;unset BOGUS\n")
 
     path = os.path.join(userhome, ".grass.cshrc") # left for backward compatibility
@@ -1250,6 +1250,7 @@
     for i in sys.argv[1:]:
         # Check if the user asked for the version
         if i in ["-v", "--version"]:
+            message("GRASS GIS %s" % grass_version)
             message('\n' + readfile(gfile("etc", "license")))
             sys.exit()
         # Check if the user asked for help

Modified: grass/branches/releasebranch_7_0/lib/init/license.txt
===================================================================
--- grass/branches/releasebranch_7_0/lib/init/license.txt	2015-01-30 12:03:53 UTC (rev 64361)
+++ grass/branches/releasebranch_7_0/lib/init/license.txt	2015-01-30 12:04:36 UTC (rev 64362)
@@ -2,7 +2,7 @@
 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
+This GRASS GIS 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