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

[svn_grass at osgeo.org]

Author: mmetz
Date: 2011-08-30 00:34:02 -0700 (Tue, 30 Aug 2011)
New Revision: 47970

Modified:
   grass/branches/develbranch_6/lib/init/init.bat
   grass/branches/develbranch_6/lib/init/init.sh
Log:
revert r47961, r47962: use .grassrc6 as GISRCRC

Modified: grass/branches/develbranch_6/lib/init/init.bat
===================================================================
--- grass/branches/develbranch_6/lib/init/init.bat	2011-08-30 06:18:44 UTC (rev 47969)
+++ grass/branches/develbranch_6/lib/init/init.bat	2011-08-30 07:34:02 UTC (rev 47970)
@@ -31,7 +31,7 @@
 set GIS_LOCK=1
 set GRASS_VERSION=GRASS_VERSION_NUMBER
 if "%HOME%"=="" set HOME=%USERPROFILE%
-set WINGISRC=%APPDATA%\grass6\rc
+set WINGISRC=%HOME%\.grassrc6
 rem Make sure %GISRC% is set so g.dirseps will work
 rem (not actually used)
 set GISRC=junk
@@ -76,7 +76,6 @@
 
 set HAVE_GISRC=false
 rem Create an initial GISRC file based on current directory
-mkdir "%APPDATA%\grass6"
 "%WINGISBASE%\etc\echo" "GISDBASE: %USERPROFILE%" | g.dirseps -g > "%WINGISRC%"
 "%WINGISBASE%\etc\echo" "LOCATION_NAME: <UNKNOWN>" >> "%WINGISRC%"
 "%WINGISBASE%\etc\echo" "MAPSET: <UNKNOWN>" >> "%WINGISRC%"

Modified: grass/branches/develbranch_6/lib/init/init.sh
===================================================================
--- grass/branches/develbranch_6/lib/init/init.sh	2011-08-30 06:18:44 UTC (rev 47969)
+++ grass/branches/develbranch_6/lib/init/init.sh	2011-08-30 07:34:02 UTC (rev 47970)
@@ -160,23 +160,14 @@
 GIS_LOCK=$$
 export GIS_LOCK
 
-if [ "$MINGW" ] ; then
-    GISRC_BASEDIR="$APPDATA/grass6"
-else
-    GISRC_BASEDIR="$HOME/.grass6"
-fi
-if [ ! -d "$GISRC_BASEDIR" ] ; then
-    mkdir "$GISRC_BASEDIR"
-fi
-
 # Set the global grassrc file
 if [ -n "$GRASS_BATCH_JOB" ] ; then
-	GISRCRC="$GISRC_BASEDIR/rc.`uname -n`"
+	GISRCRC="$HOME/.grassrc6.`uname -n`"
 	if [ ! -f "$GISRCRC" ] ; then
-		GISRCRC="$GISRC_BASEDIR/rc"
+		GISRCRC="$HOME/.grassrc6"
 	fi
 else
-	GISRCRC="$GISRC_BASEDIR/rc"
+	GISRCRC="$HOME/.grassrc6"
 fi
 
 # Set the session grassrc file
@@ -1051,6 +1042,7 @@
 # Save GISRC
 cp "$GISRC" "$GISRCRC"
 
+
 cleanup_tmp
 #### after this point no more grass modules may be called ####