[GRASS-SVN] r45600 - grass/branches/releasebranch_6_4/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-03-07 10:08:48 -0800 (Mon, 07 Mar 2011)
New Revision: 45600

Modified:
   grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
Log:
winGRASS: simplify uninstall section
(merge r45599 from devbr6)


Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2011-03-07 18:07:06 UTC (rev 45599)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2011-03-07 18:08:48 UTC (rev 45600)
@@ -903,48 +903,9 @@
 ;Uninstaller Section
 
 Section "Uninstall"
-
-	;remove files
-	Delete "$INSTDIR\Uninstall-GRASS.exe"
-	Delete "$INSTDIR\GPL.TXT"
-	Delete "$INSTDIR\AUTHORS"
-	Delete "$INSTDIR\CHANGES"
-	Delete "$INSTDIR\COPYING"	
-	Delete "$INSTDIR\${GRASS_COMMAND}.bat"
-	Delete "$INSTDIR\GRASS-WebSite.url"	
-	Delete "$INSTDIR\WinGRASS-README.url"
-	Delete "$INSTDIR\REQUIREMENTS.html"
-	Delete "$INSTDIR\README.html"
-	Delete "$INSTDIR\contributors.csv"	
-	Delete "$INSTDIR\contributors_extra.csv"
-	Delete "$INSTDIR\translators.csv"	
-	
-	;remove folders
-	RMDir /r "$INSTDIR\bin"
-	RMDir /r "$INSTDIR\bwidget"
-	RMDir /r "$INSTDIR\docs"
-	RMDir /r "$INSTDIR\driver"
-	RMDir /r "$INSTDIR\etc"
-	RMDir /r "$INSTDIR\extrabin"
-	RMDir /r "$INSTDIR\extralib"
-	RMDir /r "$INSTDIR\fonts"
-	RMDir /r "$INSTDIR\gpsbabel"
-	RMDir /r "$INSTDIR\icons"
-	RMDir /r "$INSTDIR\include"
-	RMDir /r "$INSTDIR\lib"
-	RMDir /r "$INSTDIR\locale"
-	RMDir /r "$INSTDIR\msys"
-	RMDir /r "$INSTDIR\proj"
-	RMDir /r "$INSTDIR\share"
-	RMDir /r "$INSTDIR\Python25"
-	RMDir /r "$INSTDIR\scripts"
-	RMDir /r "$INSTDIR\sqlite"
-	RMDir /r "$INSTDIR\tcl-tk"
-	RMDir /r "$INSTDIR\tools"
-	
-	;if empty, remove the install folder
-	RMDir "$INSTDIR"
-	
+	;remove files & folders
+	RMDir /r "$INSTDIR"
+		
 	;remove the Desktop ShortCut
 	SetShellVarContext current
 	Delete "$DESKTOP\GRASS ${VERSION_NUMBER}.lnk"