Improved installer script

contrib/build-wine/electrum.nsis

@@ -1,129 +1,104 @@
-; -------------------------------
+;--------------------------------
-; Start
+;Include Modern UI
- 
- 
-  !define MUI_PRODUCT "Electrum"
-  !define MUI_FILE "electrum"
-  !define MUI_VERSION ""
-  !define MUI_BRANDINGTEXT "Electrum"
-  CRCCheck On
- 
-  !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
 
+  !include "MUI2.nsh"
 
 ;--------------------------------
 ;General
 
-  OutFile "dist\electrum-setup.exe"
+  ;Name and file
-  ShowInstDetails "nevershow"
+  Name "Electrum"
-  ShowUninstDetails "nevershow"
+  OutFile "dist/electrum-setup.exe"
-  ;SetCompressor "lzma"
 
-  ;!define MUI_ICON "icon.ico"
+  ;Default installation folder
-  ;!define MUI_UNICON "icon.ico"
+  InstallDir "$PROGRAMFILES\Electrum"
-  ;!define MUI_SPECIALBITMAP "Bitmap.bmp"
   
+  ;Get installation folder from registry if available
+  InstallDirRegKey HKCU "Software\Electrum" ""
 
-;--------------------------------
+  ;Request application privileges for Windows Vista
-;Folder selection page
+  RequestExecutionLevel user
- 
-  InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
 
+;--------------------------------
+;Variables
 
 ;--------------------------------
-;Modern UI Configuration
+;Interface Settings
 
-  !define MUI_WELCOMEPAGE  
-  !define MUI_LICENSEPAGE
-  !define MUI_DIRECTORYPAGE
   !define MUI_ABORTWARNING
-  !define MUI_UNINSTALLER
-  !define MUI_UNCONFIRMPAGE
-  !define MUI_FINISHPAGE  
- 
 
 ;--------------------------------
-;Language
+;Pages
 
-  !insertmacro MUI_LANGUAGE "English"
+  !insertmacro MUI_PAGE_LICENSE "tmp/electrum/LICENCE"
+  ;!insertmacro MUI_PAGE_COMPONENTS
+  !insertmacro MUI_PAGE_DIRECTORY
   
+  ;Start Menu Folder Page Configuration
+  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" 
+  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Electrum" 
+  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
   
-;-------------------------------- 
+  ;!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
-;Modern UI System
   
-  ;!insertmacro MUI_SYSTEM 
+  !insertmacro MUI_PAGE_INSTFILES
   
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
 
 ;--------------------------------
-;Data
+;Languages
- 
-  ;LicenseData "license.txt"
  
+  !insertmacro MUI_LANGUAGE "English"
 
 ;--------------------------------
 ;Installer Sections
-Section "install" ;Installation info
 
-;Add files
+Section
-  SetOutPath "$INSTDIR"
 
-  ;File "${MUI_FILE}.exe"
-  ;File "${MUI_FILE}.ini"
-  ;File "license.txt"
   SetOutPath "$INSTDIR"
+  
+  ;ADD YOUR OWN FILES HERE...
   file /r dist\electrum\*.*
   
-;create desktop shortcut
+  ;Store installation folder
-  CreateShortCut "$DESKTOP\${MUI_PRODUCT}.lnk" "$INSTDIR\${MUI_FILE}.exe" ""
+  WriteRegStr HKCU "Software\Electrum" "" $INSTDIR
   
-;create start-menu items
+  ;Create uninstaller
-  CreateDirectory "$SMPROGRAMS\${MUI_PRODUCT}"
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
-  CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\${MUI_PRODUCT}\${MUI_PRODUCT}.lnk" "$INSTDIR\${MUI_FILE}.exe" "" "$INSTDIR\${MUI_FILE}.exe" 0
 
-;write uninstall information to the registry
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PRODUCT}" "DisplayName" "${MUI_PRODUCT} (remove only)"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PRODUCT}" "UninstallString" "$INSTDIR\Uninstall.exe"
 
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
+  CreateShortCut "$DESKTOP\Electrum.lnk" "$INSTDIR\electrum.exe" ""
+
+  ;create start-menu items
+  CreateDirectory "$SMPROGRAMS\Electrum"
+  CreateShortCut "$SMPROGRAMS\Electrum\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
+  CreateShortCut "$SMPROGRAMS\Electrum\Electrum.lnk" "$INSTDIR\electrum.exe" "" "$INSTDIR\electrum.exe" 0
 
 SectionEnd
 
+;--------------------------------
+;Descriptions
+
+  ;Assign language strings to sections
+  ;!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  ;  !insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
+  ;!insertmacro MUI_FUNCTION_DESCRIPTION_END
  
 ;--------------------------------
 ;Uninstaller Section
+
 Section "Uninstall"
 
-;Delete Files 
+  ;ADD YOUR OWN FILES HERE...
   RMDir /r "$INSTDIR\*.*"
 
-;Remove the installation directory
   RMDir "$INSTDIR"
   
-;Delete Start Menu Shortcuts
+  Delete "$DESKTOP\Electrum.lnk"
-  Delete "$DESKTOP\${MUI_PRODUCT}.lnk"
+  Delete "$SMPROGRAMS\Electrum\*.*"
-  Delete "$SMPROGRAMS\${MUI_PRODUCT}\*.*"
+  RmDir  "$SMPROGRAMS\Electrum"
-  RmDir  "$SMPROGRAMS\${MUI_PRODUCT}"
     
-;Delete Uninstaller And Unistall Registry Entries
+  DeleteRegKey /ifempty HKCU "Software\Electrum"
-  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\${MUI_PRODUCT}"
-  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PRODUCT}"  
 
 SectionEnd
- 
- 
-;--------------------------------    
-;MessageBox Section
- 
- 
-;Function that calls a messagebox when installation finished correctly
-Function .onInstSuccess
-  MessageBox MB_OK "You have successfully installed ${MUI_PRODUCT}. Use the desktop icon to start the program."
-FunctionEnd
- 
- 
-Function un.onUninstSuccess
-  MessageBox MB_OK "You have successfully uninstalled ${MUI_PRODUCT}."
-FunctionEnd
- 
-;eof