summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-06-18 21:53:32 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-06-18 21:54:23 (GMT)
commitb347d6f62c62aaddcaa3c01fbe3d11b2073dbd40 (patch)
tree593416001dd67bb1da2b7917ed8fd42fc0a560bb
parent154bf14ac15fc7bff918c20814b29b5cc3bc5ba4 (diff)
downloadswift-contrib-b347d6f62c62aaddcaa3c01fbe3d11b2073dbd40.zip
swift-contrib-b347d6f62c62aaddcaa3c01fbe3d11b2073dbd40.tar.bz2
Windows installer should put the Start Menu shortcuts in the right place.
Resolves: #311
-rw-r--r--Swift/Packaging/nsis/swift.nsi18
1 files changed, 9 insertions, 9 deletions
diff --git a/Swift/Packaging/nsis/swift.nsi b/Swift/Packaging/nsis/swift.nsi
index 405bdb2..1479ba6 100644
--- a/Swift/Packaging/nsis/swift.nsi
+++ b/Swift/Packaging/nsis/swift.nsi
@@ -63,11 +63,11 @@ File "..\..\QtUI\Swift\imageformats\qsvg4.dll"
File "..\..\QtUI\Swift\imageformats\qtiff4.dll"
# create start menu item
-CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Swift.lnk" "$INSTDIR\Swift.exe"
-CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall Swift.lnk" "$INSTDIR\uninstaller.exe"
-# remember where we put them
-WriteRegStr HKCU "Software\Swift\" "Start Menu Folder" "$SMPROGRAMS\$StartMenuFolder"
+!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
+ CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Swift.lnk" "$INSTDIR\Swift.exe"
+ CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall Swift.lnk" "$INSTDIR\uninstaller.exe"
+!insertmacro MUI_STARTMENU_WRITE_END
# Add the information to Add/Remove
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Swift" "DisplayName" "Swift"
@@ -132,10 +132,10 @@ section "Uninstall"
RmDir $INSTDIR\imageformats
RmDir $INSTDIR
- ReadRegStr $0 HKCU "Software\Swift\" "Start Menu Folder"
- Delete "$0\Swift.lnk"
- Delete "$0\Uninstall Swift.lnk"
- RmDir "$0"
+ !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
+ Delete "$SMPROGRAMS\$StartMenuFolder\Swift.lnk"
+ Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall Swift.lnk"
+ RmDir "$SMPROGRAMS\$StartMenuFolder"
DeleteRegKey HKEY_CURRENT_USER "Software\Swift\Start Menu Folder"
DeleteRegKey /ifempty HKEY_CURRENT_USER "Software\Swift"