[GRASS-SVN] r36061 - grass/branches/develbranch_6/lib/init

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-02-22 23:03:57 -0500 (Sun, 22 Feb 2009)
New Revision: 36061

Modified:
   grass/branches/develbranch_6/lib/init/grass.bat
   grass/branches/develbranch_6/lib/init/init.bat
Log:
only run clean_temp if the location already exists (trac #499)

Modified: grass/branches/develbranch_6/lib/init/grass.bat
===================================================================
--- grass/branches/develbranch_6/lib/init/grass.bat	2009-02-22 23:57:45 UTC (rev 36060)
+++ grass/branches/develbranch_6/lib/init/grass.bat	2009-02-23 04:03:57 UTC (rev 36061)
@@ -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/develbranch_6/lib/init/init.bat
===================================================================
--- grass/branches/develbranch_6/lib/init/init.bat	2009-02-22 23:57:45 UTC (rev 36060)
+++ grass/branches/develbranch_6/lib/init/init.bat	2009-02-23 04:03:57 UTC (rev 36061)
@@ -59,13 +59,17 @@
 
 :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
@@ -82,9 +86,11 @@
 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:
+)
 
-
 if "%GRASS_GUI%"=="text" goto text
 if "%GRASS_GUI%"=="wxpython" goto wxpython