[GRASS-SVN] r66927 - grass/trunk/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-11-25 10:58:44 -0800 (Wed, 25 Nov 2015)
New Revision: 66927

Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
Log:
winGRASS: partly revert r66926

Modified: grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2015-11-25 18:53:42 UTC (rev 66926)
+++ grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2015-11-25 18:58:44 UTC (rev 66927)
@@ -651,15 +651,20 @@
 	;Create the Desktop Shortcut
 	SetShellVarContext current
 	
-	CreateShortCut "$DESKTOP\${GRASS_BASE}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wx"\
+	CreateShortCut "$DESKTOP\${GRASS_BASE}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-gui"\
 	"$INSTALL_DIR\gui\icons\grass.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS GIS ${VERSION_NUMBER}"
 	
 	;Create the Windows Start Menu Shortcuts
 	SetShellVarContext all
 	
-	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-gui"\
+	CreateDirectory "$SMPROGRAMS\${GRASS_BASE}"
+	
+	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\${GRASS_BASE}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-gui"\
 	"$INSTALL_DIR\gui\icons\grass.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS GIS ${VERSION_NUMBER}"
 	
+	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\Uninstall ${GRASS_BASE}.lnk" "$INSTALL_DIR\Uninstall-GRASS.exe" ""\
+	"$INSTALL_DIR\Uninstall-GRASS.exe" "" SW_SHOWNORMAL "" "Uninstall GRASS GIS ${VERSION_NUMBER}"
+	
 	;Create the grass_command.bat
 	ClearErrors
 	FileOpen $0 $INSTALL_DIR\${GRASS_COMMAND}.bat w
@@ -1080,7 +1085,7 @@
 	
 	;remove the Programs Start ShortCuts
 	SetShellVarContext all
-	Delete "$SMPROGRAMS\${GRASS_BASE}.lnk"
+	RMDir /r "$SMPROGRAMS\${GRASS_BASE}"
 	
 	;remove the $APPDATA\GRASS at GRASS_VERSION_MAJOR@ folder
 	;disabled, don't remove user settings