[GRASS-SVN] r36070 - grass/branches/releasebranch_6_4/lib/init

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-02-24 00:01:00 -0500 (Tue, 24 Feb 2009)
New Revision: 36070

Modified:
   grass/branches/releasebranch_6_4/lib/init/grass.bat
   grass/branches/releasebranch_6_4/lib/init/grass6.html
   grass/branches/releasebranch_6_4/lib/init/init.bat
   grass/branches/releasebranch_6_4/lib/init/init.sh
Log:
merge init.bat and -wx alias changes from devbr6

Modified: grass/branches/releasebranch_6_4/lib/init/grass.bat
===================================================================
--- grass/branches/releasebranch_6_4/lib/init/grass.bat	2009-02-24 02:27:56 UTC (rev 36069)
+++ grass/branches/releasebranch_6_4/lib/init/grass.bat	2009-02-24 05:01:00 UTC (rev 36070)
@@ -29,5 +29,5 @@
 rem set GRASS_PROJSHARE=c:/grass/share/proj
 
 set WINGISBASE=GISBASE_VALUE
-"%WINGISBASE%\etc\init.bat" %*
+"%WINGISBASE%\etc\Init.bat" %*
 

Modified: grass/branches/releasebranch_6_4/lib/init/grass6.html
===================================================================
--- grass/branches/releasebranch_6_4/lib/init/grass6.html	2009-02-24 02:27:56 UTC (rev 36069)
+++ grass/branches/releasebranch_6_4/lib/init/grass6.html	2009-02-24 05:01:00 UTC (rev 36070)
@@ -17,7 +17,7 @@
 <H2>SYNOPSIS</H2>
 
 <B>grass64</B> [<B>-</B>] [<B>-v</B>] [<B>-h | -help | --help</B>]
-    [<B>-text | -gui | -tcltk | -wxpython]</B>]
+    [<B>-text | -gui | -tcltk | -oldtcltk | -wxpython | -wx]</B>]
     [[[<B>&lt;GISDBASE&gt;/</B>]<B>&lt;LOCATION_NAME&gt;/</B>]
     	<B>&lt;MAPSET&gt;</B>]
 
@@ -70,7 +70,10 @@
 <DT><B>-gui</B> (or <B>-tcltk</B>)
 <DD> Indicates that the old Tcl/Tk based graphical user interface should be used
 
-<DT><B>-wxpython</B>
+<DT><B>-oldtcltk</B>
+<DD> Indicates that the even older Tcl/Tk based graphical user interface should be used
+
+<DT><B>-wxpython</B> (or <B>-wx</B>)
 <DD> Indicates that the new Python based graphical user interface should be used
 
 <DT><B>-v</B> <B>--version</B>

Modified: grass/branches/releasebranch_6_4/lib/init/init.bat
===================================================================
--- grass/branches/releasebranch_6_4/lib/init/init.bat	2009-02-24 02:27:56 UTC (rev 36069)
+++ grass/branches/releasebranch_6_4/lib/init/init.bat	2009-02-24 05:01:00 UTC (rev 36070)
@@ -54,17 +54,22 @@
 
 if "%1" == "-tcltk" goto setguimode
 if "%1" == "-wxpython" goto setwxmode
+if "%1" == "-wx" goto setwxmode
 if "%1" == "-gui" goto setguimode
 
 :afterguicheck
 
-if exist "%WINGISRC%" goto aftercreategisrc
+if exist "%WINGISRC%" (
+   set HAVE_GISRC=true
+   goto aftercreategisrc
+)
 
+set HAVE_GISRC=false
 rem Create an initial GISRC file based on current directory
 "%WINGISBASE%\etc\echo" "GISDBASE: %USERPROFILE%" | g.dirseps -g > "%WINGISRC%"
 "%WINGISBASE%\etc\echo" "LOCATION_NAME: <UNKNOWN>" >> "%WINGISRC%"
 "%WINGISBASE%\etc\echo" "MAPSET: <UNKNOWN>" >> "%WINGISRC%"
-	    
+
 :aftercreategisrc
 
 rem Now set the real GISRC
@@ -81,9 +86,12 @@
 rem Set tcltk as default if not specified elsewhere
 if "%GRASS_GUI%"=="" set GRASS_GUI=tcltk
 
-"%WINGISBASE%\etc\clean_temp" > NUL:
+rem Clean out old .tmp files from the mapset
+if "%HAVE_GISRC%"=="true" (
+  "%WINGISBASE%\etc\clean_temp" > NUL:
+)
+set HAVE_GISRC=
 
-
 if "%GRASS_GUI%"=="text" goto text
 if "%GRASS_GUI%"=="wxpython" goto wxpython
 
@@ -136,7 +144,7 @@
 "%WINGISBASE%\etc\echo" "See the licence terms with:              g.version -c"
 "%WINGISBASE%\etc\echo" ""
 
-prompt GRASS %GRASS_VERSION% $C%LOCATION_NAME%$F:$P $G
+prompt GRASS %GRASS_VERSION% $C%LOCATION_NAME%$F$G 
 
 cmd.exe
 
@@ -169,6 +177,9 @@
 
 :exitinit
 
+rem Clean out old .tmp files from the mapset
+"%WINGISBASE%\etc\clean_temp" > NUL:
+
 set PATH=%SAVEPATH%
 set SAVEPATH=
 exit /b

Modified: grass/branches/releasebranch_6_4/lib/init/init.sh
===================================================================
--- grass/branches/releasebranch_6_4/lib/init/init.sh	2009-02-24 02:27:56 UTC (rev 36069)
+++ grass/branches/releasebranch_6_4/lib/init/init.sh	2009-02-24 05:01:00 UTC (rev 36070)
@@ -82,7 +82,7 @@
 	help|-h|-help|--help)
 	    echo "Usage:"
 	    echo "  $CMD_NAME [-h | -help | --help] [-v | --version] [-c]"
-	    echo "          [-text | -gui | -tcltk | -oldtcltk | -wxpython]"
+	    echo "          [-text | -gui | -tcltk | -oldtcltk | -wxpython | -wx]"
 	    echo "          [[[<GISDBASE>/]<LOCATION_NAME>/]<MAPSET>]"
 	    echo
             echo "Flags:"
@@ -97,7 +97,7 @@
             echo "                                   and set as default"
 	    echo "  -oldtcltk                      use old Tcl/Tk based graphical user interface"
             echo "                                   and set as default"
-            echo "  -wxpython                      use wxPython based graphical user interface"
+            echo "  -wxpython or -wx               use wxPython based graphical user interface"
             echo "                                   and set as default"
             echo
             echo "Parameters:"
@@ -143,7 +143,7 @@
 	    ;;
 
 	# Check if the -wxpython flag was given
-	-wxpython)
+	-wxpython | -wx)
 	    GRASS_GUI="wxpython"
 	    shift
 	    ;;