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

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-04-25 20:14:56 -0700 (Thu, 25 Apr 2013)
New Revision: 56001

Modified:
   grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
Log:
avoid duplicate 'rc' file (#1947), 'Delete' doesn't seem to work for folders, try RMDir instead (#1946)

Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl	2013-04-25 23:31:18 UTC (rev 56000)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl	2013-04-26 03:14:56 UTC (rev 56001)
@@ -834,13 +834,13 @@
 	;${StrReplace} "$UNIX_LIKE_GIS_DATABASE_PATH" "\" "/" "$GIS_DATABASE"
 
 	SetShellVarContext current  
-	${If} ${FileExists} "$APPDATA\GRASS at GRASS_VERSION_MAJOR@\rc"
-	      DetailPrint "File $APPDATA\GRASS at GRASS_VERSION_MAJOR@\rc already exists. Skipping."
+	${If} ${FileExists} "$APPDATA\GRASS at GRASS_VERSION_MAJOR@\grassrc6"
+	      DetailPrint "File $APPDATA\GRASS at GRASS_VERSION_MAJOR@\grassrc6 already exists. Skipping."
 	${Else}
-	      ;create $APPDATA\GRASS at GRASS_VERSION_MAJOR@\rc
+	      ;create $APPDATA\GRASS at GRASS_VERSION_MAJOR@\grassrc6
 	      ClearErrors
 	      CreateDirectory	$APPDATA\GRASS at GRASS_VERSION_MAJOR@
-	      FileOpen $0 $APPDATA\GRASS at GRASS_VERSION_MAJOR@\rc w
+	      FileOpen $0 $APPDATA\GRASS at GRASS_VERSION_MAJOR@\grassrc6 w
 	      IfErrors done_create_grass_rc
 	      FileWrite $0 'GISDBASE: $GIS_DATABASE$\r$\n'
 	      FileWrite $0 'LOCATION_NAME: demolocation$\r$\n'
@@ -998,7 +998,7 @@
 	ExecWait "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2010_x86.exe /q"
 	CopyFiles "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\*.dll" "$INSTDIR\extralib"
 	Delete "$TEMP\$ARCHIVE_NAME"
-	Delete "$TEMP\$ORIGINAL_UNTAR_FOLDER"
+	RMDir /r "$TEMP\$ORIGINAL_UNTAR_FOLDER"
 	Goto end
 	
 	download_failed: