Update all occurrences of -text, -gtext, -gui to --text, --gtext, --gui (trac https://trac.osgeo.org/grass/ticket/1665)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@73265 15284696-431f-4ddb-bdfa-cd5b030d7da7

doc/grass_database.html

@@ -222,7 +222,7 @@ from the command line. For example, the following will start
 in a given Mapset with only command line interface:
 
 <div class="code"><pre>
-grass77 -text ~/grassdata/mylocation/mymapset
+grass77 --text ~/grassdata/mylocation/mymapset
 </pre></div>
 
 And the following will create the given Location with projection given

gui/wxpython/README

@@ -6,7 +6,7 @@ $Date$
 1 - REQUIREMENTS
 
  GRASS GIS >= 6.4
- Python    >= 2.4 (Python 3 not supported)
+ Python    >= 2.4
  	Python ElementTree (only for Python 2.4)
  wxPython  >= 2.8.10.1
  NumPy     >= 1.0.4
@@ -16,9 +16,9 @@ $Date$
 2 - STARTUP WITH GRASS INITIALIZATION
 
 If you want to launch wxPython GUI automatically, start GRASS with
-`-gui` parameter
+`--gui` parameter
 
-$ grass77 -gui
+$ grass77 --gui
 
 
 3 - STARTUP FROM GRASS TERMINAL

gui/wxpython/docs/wxGUI.html

@@ -684,10 +684,10 @@ g.gui wxpython workspace=file.gxw
 
 <p>
 The user can also start GRASS from the shell command line with the wxGUI
-specifying the <tt>-gui</tt> (or <tt>-wxpython</tt>) switch:
+specifying the <tt>--gui</tt> switch:
 
 <div class="code"><pre>
-grass77 -gui
+grass77 --gui
 </pre></div>
 
 

lib/init/README

@@ -1,11 +1,12 @@
 o GRASS text mode startup
 
-  "grass77" starts up d.m by default (if not first time user).
-  "grass77 -text" will start up in text mode.
-  "grass77 -wxpython" or "grass77 -gui" will start up in wxpython mode.
+  "grass77" starts up g.gui by default (if not first time user).
+  "grass77 --text" will start up in text mode.
+  "grass77 --gtext" will start up with graphical welcome screen but continue then in text mode.
+  "grass77 --gui" will start up in wxpython mode.
 
-  You can use alias "grass77" to "grass77 -text" to use text mode by default.
-  Or set env var GRASS_GUI=text.
+  You can set an alias "grass77" to e.g. "grass77 --text" to use text mode by default.
+  Or set the environmental variable GRASS_GUI=text.
 
 
 o GRASS non-interactive startup examples
@@ -77,5 +78,5 @@ o GRASS non-interactive startup examples
 			# GISDBASE/loc2-1/map1-1 location
 
 
-  Any suggestionss to <grass-dev@lists.osgeo.org>
+  Send any suggestions to <grass-dev@lists.osgeo.org> at https://lists.osgeo.org/pipermail/grass-dev/
 

lib/init/grass.py

@@ -1910,13 +1910,13 @@ def parse_cmdline(argv, default_gui):
         elif i in ["help", "-h", "-help", "--help", "--h"]:
             help_message(default_gui=default_gui)
             sys.exit()
-        # Check if the -text flag was given
+        # Check if the --text flag was given
         elif i in ["-text", "--text"]:
             params.grass_gui = 'text'
-        # Check if the -gtext flag was given
+        # Check if the --gtext flag was given
         elif i in ["-gtext", "--gtext"]:
             params.grass_gui = 'gtext'
-        # Check if the -gui flag was given
+        # Check if the --gui flag was given
         elif i in ["-gui", "--gui"]:
             params.grass_gui = default_gui
         # Check if the -wxpython flag was given

lib/init/grass7.html

@@ -4,7 +4,7 @@
 
 <b>grass77</b> [<b>-h</b> | <b>-help</b> | <b>--help</b>] [<b>-v</b> | <b>--version</b>]
     [<b>-c</b> | <b>-c geofile</b> | <b>-c EPSG:code[:datum_trans]</b>]
-    [<b>-text</b> | <b>-gtext</b> | <b>-gui</b>]
+    [<b>--text</b> | <b>--gtext</b> | <b>--gui</b>]
     [[[<b>&lt;GISDBASE&gt;/</b>]<b>&lt;LOCATION_NAME&gt;/</b>]
     	<b>&lt;MAPSET&gt;</b>]
 
@@ -34,15 +34,15 @@
 <dd> Exit after creation of location or mapset. Only with <b>-c</b> flag
 
 <dt><b>-f</b>
-<dd> Forces removal of .gislock if exists (use with care!). Only with -text flag
+<dd> Forces removal of .gislock if exists (use with care!). Only with --text flag
 
-<dt><b>-text</b>
+<dt><b>--text</b>
 <dd> Indicates that Text-based User Interface should be used (skip welcome screen)
 
-<dt><b>-gtext</b>
+<dt><b>--gtext</b>
 <dd> Indicates that Text-based User Interface should be used (show welcome screen)
 
-<dt><b>-gui</b>
+<dt><b>--gui</b>
 <dd> Indicates that Graphical User Interface
 (<em><a href="wxGUI.html">wxGUI</a></em>) should be used
 
@@ -97,7 +97,7 @@ and mapset. Thus, the next time the user runs GRASS, typing
 <em>grass77</em> (without any options) will start GRASS with the
 previous settings for the user interface and mapset selected.
 
-<p>If you specify a graphical user interface (<b>-gui</b>)
+<p>If you specify a graphical user interface (<b>--gui</b>)
 the <em>grass77</em> program will try to verify that the system you
 specified exists and that you can access it successfully. If any of
 these checks fail then <em>grass77</em> will automatically switch back
@@ -246,16 +246,16 @@ script. The script file must have its executable bit set.
 <dd> Start GRASS using the default user interface. The user will be
     prompted to choose the appropriate location and mapset.
 
-<dt><b>grass77 -gui</b>
+<dt><b>grass77 --gui</b>
 <dd> Start GRASS using the graphical user interface. The user will be
     prompted to choose the appropriate location and mapset.
 
-<dt><b>grass77 -text</b>
+<dt><b>grass77 --text</b>
 <dd> Start GRASS using the text-based user interface. Appropriate
 location and mapset must be set by environmental variables (see
 examples below) otherwise taken from the last GRASS session.</dd>
 
-<dt><b>grass77 -gtext</b>
+<dt><b>grass77 --gtext</b>
 <dd> Start GRASS using the text-based user interface. The user will be
     prompted to choose the appropriate location and mapset.
 
@@ -263,7 +263,7 @@ examples below) otherwise taken from the last GRASS session.</dd>
 <dd> Start GRASS using the default user interface and automatically
     launch into the given mapset, bypassing the mapset selection menu.
 
-<dt><b>grass77 -gui -</b>
+<dt><b>grass77 --gui -</b>
 <dd> Start GRASS using the graphical user interface and try to
     obtain the location and mapset from environment variables.
 

mswindows/GRASS-Installer.nsi.tmpl

@@ -657,7 +657,7 @@ Section "GRASS" SecGRASS
 	;Create the Desktop Shortcut
 	SetShellVarContext current
 	
-	CreateShortCut "$DESKTOP\${GRASS_BASE}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-gui"\
+	CreateShortCut "$DESKTOP\${GRASS_BASE}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "--gui"\
 	"$INSTALL_DIR\gui\icons\grass.ico" "" SW_SHOWNORMAL "" "Launch GRASS GIS ${VERSION_NUMBER}"
 	
 	;Create the Windows Start Menu Shortcuts
@@ -665,7 +665,7 @@ Section "GRASS" SecGRASS
 	
 	CreateDirectory "$SMPROGRAMS\${GRASS_BASE}"
 	
-	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\${GRASS_BASE}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-gui"\
+	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\${GRASS_BASE}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "--gui"\
 	"$INSTALL_DIR\gui\icons\grass.ico" "" SW_SHOWNORMAL "" "Launch GRASS GIS ${VERSION_NUMBER}"
 	
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\Uninstall ${GRASS_BASE}.lnk" "$INSTALL_DIR\Uninstall-GRASS.exe" ""\

mswindows/osgeo4w/postinstall.bat

@@ -3,8 +3,8 @@ set BATCH=%OSGEO4W_ROOT%\bin\@GRASS_EXECUTABLE@.bat
 textreplace -std -t "%BATCH%"
 textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass-@VERSION@\etc\fontcap
 
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@.lnk"       "%BATCH%"  "-gui" \ "Launch GRASS GIS @VERSION@" 1 "%ICON%" 
-xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION@.lnk" "%BATCH%"  "-gui" \ "Launch GRASS GIS @VERSION@" 1 "%ICON%" 
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@.lnk"       "%BATCH%"  "--gui" \ "Launch GRASS GIS @VERSION@" 1 "%ICON%" 
+xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION@.lnk" "%BATCH%"  "--gui" \ "Launch GRASS GIS @VERSION@" 1 "%ICON%" 
 
 rem run g.mkfontcap outside a GRASS session during
 rem an OSGeo4W installation for updating paths to fonts