winGRASS: partly revert https://trac.osgeo.org/grass/changeset/66926

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@66927 15284696-431f-4ddb-bdfa-cd5b030d7da7

mswindows/GRASS-Installer.nsi.tmpl

@@ -651,15 +651,20 @@ Section "GRASS" SecGRASS
 	;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 @@ Section "Uninstall"
 	
 	;remove the Programs Start ShortCuts
 	SetShellVarContext all
-	Delete "$SMPROGRAMS\${GRASS_BASE}.lnk"
+	RMDir /r "$SMPROGRAMS\${GRASS_BASE}"
 	
 	;remove the $APPDATA\GRASS@GRASS_VERSION_MAJOR@ folder
 	;disabled, don't remove user settings