[GRASS-SVN] r47971 - grass/branches/develbranch_6/mswindows

[svn_grass at osgeo.org]

Author: mmetz
Date: 2011-08-30 00:35:00 -0700 (Tue, 30 Aug 2011)
New Revision: 47971

Modified:
   grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
Log:
revert r47954: use .grassrc6 as GISRCRC

Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi	2011-08-30 07:34:02 UTC (rev 47970)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi	2011-08-30 07:35:00 UTC (rev 47971)
@@ -773,6 +773,8 @@
 	FileWrite $0 'GEOTIFF_CSV="$INSTALL_DIR\share\epsg_csv"$\r$\n'
 	FileWrite $0 'export GEOTIFF_CSV $\r$\n'
 	FileWrite $0 '$\r$\n'
+	FileWrite $0 'cd "$USERPROFILE"'
+	FileWrite $0 '$\r$\n' 
 	FileWrite $0 'exec "$$GISBASE/etc/Init.sh" "$$@"'
 	FileClose $0
 	done_create_grass_command:
@@ -798,18 +800,19 @@
 	;replace \ with / in $GIS_DATABASE
 	${StrReplace} "$UNIX_LIKE_GIS_DATABASE_PATH" "\" "/" "$GIS_DATABASE"
   
-	;create $APPDATA\grass6\rc
+	;create $PROFILE\.grassrc6
 	SetShellVarContext current
 	ClearErrors
-	CreateDirectory	$APPDATA\grass6
-	FileOpen $0 $APPDATA\grassrc6\rc w
-	IfErrors done_create_grassrc6\rc
+	FileOpen $0 $PROFILE\.grassrc6 w
+	IfErrors done_create_.grassrc6
 	FileWrite $0 'GISDBASE: $UNIX_LIKE_GIS_DATABASE_PATH$\r$\n'
 	FileWrite $0 'LOCATION_NAME: demolocation$\r$\n'
 	FileWrite $0 'MAPSET: PERMANENT$\r$\n'
 	FileClose $0	
-	done_create_grassrc6\rc:
+	done_create_.grassrc6:
 	
+	CopyFiles $PROFILE\.grassrc6 $INSTALL_DIR\msys\home\$USERNAME
+                 
 SectionEnd
 
 Function DownloadDataSet
@@ -916,9 +919,9 @@
 	SetShellVarContext all
 	RMDir /r "$SMPROGRAMS\${GRASS_BASE}"
 	
-	;remove the $APPDATA\grass6 folder
+	;remove the .grassrc6 file
 	SetShellVarContext current
-	RMDir /r "$APPDATA\grass6"
+	Delete "$PROFILE\.grassrc6"	
 
 	;remove the Registry Entries
 	DeleteRegKey HKLM "Software\${GRASS_BASE}"