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

[svn_grass at osgeo.org]

Author: mmetz
Date: 2011-08-29 12:21:22 -0700 (Mon, 29 Aug 2011)
New Revision: 47956

Modified:
   grass/branches/develbranch_6/lib/init/init.bat
   grass/branches/develbranch_6/lib/init/init.sh
Log:
lib/init: update location of GISRC file

Modified: grass/branches/develbranch_6/lib/init/init.bat
===================================================================
--- grass/branches/develbranch_6/lib/init/init.bat	2011-08-29 19:02:41 UTC (rev 47955)
+++ grass/branches/develbranch_6/lib/init/init.bat	2011-08-29 19:21:22 UTC (rev 47956)
@@ -31,7 +31,7 @@
 set GIS_LOCK=1
 set GRASS_VERSION=GRASS_VERSION_NUMBER
 if "%HOME%"=="" set HOME=%USERPROFILE%
-set WINGISRC=%HOME%\.grassrc6
+set WINGISRC=%APPDATA%\grass6\rc
 rem Make sure %GISRC% is set so g.dirseps will work
 rem (not actually used)
 set GISRC=junk

Modified: grass/branches/develbranch_6/lib/init/init.sh
===================================================================
--- grass/branches/develbranch_6/lib/init/init.sh	2011-08-29 19:02:41 UTC (rev 47955)
+++ grass/branches/develbranch_6/lib/init/init.sh	2011-08-29 19:21:22 UTC (rev 47956)
@@ -162,12 +162,21 @@
 
 # Set the global grassrc file
 if [ -n "$GRASS_BATCH_JOB" ] ; then
-	GISRCRC="$HOME/.grassrc6.`uname -n`"
+	if [ "$MINGW" ] ; then
+		GISRCRC="$APPDATA/grassrc6/rc.`uname -n`"
+	else
+		GISRCRC="$HOME/.grass6/rc.`uname -n`"
 	if [ ! -f "$GISRCRC" ] ; then
-		GISRCRC="$HOME/.grassrc6"
+		if [ "$MINGW" ] ; then
+		    GISRCRC="$APPDATA/grass6/rc"
+		else
+		    GISRCRC="$HOME/.grass6/rc"
 	fi
 else
-	GISRCRC="$HOME/.grassrc6"
+	if [ "$MINGW" ] ; then
+	    GISRCRC="$APPDATA/grass6/rc"
+	else
+	    GISRCRC="$HOME/.grass6/rc"
 fi
 
 # Set the session grassrc file