From 285b31e7c97307e2342b32097f4a42acc2dbb53a Mon Sep 17 00:00:00 2001
From: hensm <m+github@matt.tf>
Date: Thu, 7 Mar 2019 23:55:39 +0000
Subject: [PATCH] Use MUI pages for Windows installer UI

---
 app/bin/build.js                |  9 ++++++
 app/bin/lib/paths.js            |  4 ++-
 app/packaging/win/installer.nsi | 49 ++++++++++++++++++++++++++-------
 package.json                    |  4 +++
 4 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/app/bin/build.js b/app/bin/build.js
index 8e5404d..ae60c4c 100644
--- a/app/bin/build.js
+++ b/app/bin/build.js
@@ -14,6 +14,9 @@ const { spawnSync } = require("child_process");
 const { __applicationName: applicationName
       , __applicationVersion: applicationVersion } = require("../package.json");
 
+const { author
+      , homepage } = require("../../package.json");
+
 const { __extensionId: extensionId } = require("../../ext/package.json");
 
 const { executableName
@@ -22,6 +25,7 @@ const { executableName
       , manifestPath
       , pkgPlatform
       , DIST_PATH
+      , LICENSE_PATH
       , WIN_REGISTRY_KEY } = require("./lib/paths");
 
 
@@ -460,6 +464,11 @@ function packageWin32 (
       , manifestName
       , winRegistryKey: WIN_REGISTRY_KEY
       , outputName
+      , licensePath: LICENSE_PATH
+
+        // Uninstaller keys
+      , registryPublisher: author
+      , registryUrlInfoAbout: homepage
     };
 
     // Write templated script to build dir
diff --git a/app/bin/lib/paths.js b/app/bin/lib/paths.js
index 7d3880f..33261b2 100644
--- a/app/bin/lib/paths.js
+++ b/app/bin/lib/paths.js
@@ -5,8 +5,10 @@ const { __applicationName
       , __applicationExecutableName } = require("../../package.json");
 
 
-exports.DIST_PATH = path.join(__dirname, "../../../dist/app");
+const rootPath = path.join(__dirname, "../../../");
 
+exports.DIST_PATH = path.join(rootPath, "dist/app");
+exports.LICENSE_PATH = path.join(rootPath, "LICENSE");
 exports.WIN_REGISTRY_KEY = __applicationName;
 
 exports.executableName = {
diff --git a/app/packaging/win/installer.nsi b/app/packaging/win/installer.nsi
index 71701dc..a38fcc3 100644
--- a/app/packaging/win/installer.nsi
+++ b/app/packaging/win/installer.nsi
@@ -1,12 +1,35 @@
-!include LogicLib.nsh
+!include MUI2.nsh
+
+# MUI general
+!define MUI_ABORTWARNING
+
+# Installer pages
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "{{{licensePath}}}"
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+# Uninstaller pages
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+!insertmacro MUI_UNPAGE_FINISH
+
+!insertmacro MUI_LANGUAGE "English"
+
+
+!define KEY_MANIFEST "Software\Mozilla\NativeMessagingHosts\{{applicationName}}"
+!define KEY_UNINSTALL "Software\Microsoft\Windows\CurrentVersion\Uninstall\{{winRegistryKey}}"
 
-!define MANIFEST_KEY "Software\Mozilla\NativeMessagingHosts\{{applicationName}}"
-!define UNINSTALL_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\{{winRegistryKey}}"
 
 Name "{{applicationName}} v{{applicationVersion}}"
+
+VIProductVersion "{{applicationVersion}}.0"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "{{applicationName}}"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "{{applicationVersion}}"
+
 OutFile "{{outputName}}"
 InstallDir "{{executablePath}}"
-RequestExecutionLevel user
+RequestExecutionLevel admin
 
 Section
     SetRegView 64
@@ -18,13 +41,19 @@ Section
     File "{{manifestName}}"
 
     # Native manifest key
-    WriteRegStr HKLM "${MANIFEST_KEY}" "" "$INSTDIR\{{manifestName}}"
+    WriteRegStr HKLM "${KEY_MANIFEST}" "" "$INSTDIR\{{manifestName}}"
 
     # Create and register uninstaller
     WriteUninstaller "$INSTDIR\uninstall.exe"
-    WriteRegStr HKLM "${UNINSTALL_KEY}" "DisplayName" "{{applicationName}}"
-    WriteRegStr HKLM "${UNINSTALL_KEY}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
-    WriteRegStr HKLM "${UNINSTALL_KEY}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
+    WriteRegStr HKLM ${KEY_UNINSTALL} DisplayName "{{applicationName}}"
+    WriteRegStr HKLM ${KEY_UNINSTALL} DisplayVersion "{{applicationVersion}}"
+    WriteRegStr HKLM ${KEY_UNINSTALL} Publisher "{{{registryPublisher}}}"
+    WriteRegStr HKLM ${KEY_UNINSTALL} URLInfoAbout "{{{registryUrlInfoAbout}}}"
+    WriteRegStr HKLM ${KEY_UNINSTALL} InstallLocation "$\"$INSTDIR$\""
+    WriteRegStr HKLM ${KEY_UNINSTALL} UninstallString "$\"$INSTDIR\uninstall.exe$\""
+    WriteRegStr HKLM ${KEY_UNINSTALL} QuietUninstallString "$\"$INSTDIR\uninstall.exe$\" /S"
+    WriteRegDWORD HKLM ${KEY_UNINSTALL} NoModify 1
+    WriteRegDWORD HKLM ${KEY_UNINSTALL} NoRepair 1
 SectionEnd
 
 Section "uninstall"
@@ -32,10 +61,10 @@ Section "uninstall"
 
     # Remove uninstaller
     Delete "$INSTDIR\uninstall.exe"
-    DeleteRegKey HKLM "${UNINSTALL_KEY}"
+    DeleteRegKey HKLM ${KEY_UNINSTALL}
 
     # Remove manifest and executable dir
-    DeleteRegKey HKLM "${MANIFEST_KEY}"
+    DeleteRegKey HKLM ${KEY_MANIFEST}
     Delete "$INSTDIR\{{executableName}}"
     Delete "$INSTDIR\{{manifestName}}"
     RMDir $INSTDIR
diff --git a/package.json b/package.json
index 3dbe704..9d2dad5 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,8 @@
 {
+    "author": "Matt Hensman <m@matt.tf>",
+    "homepage": "https://hensm.github.io/fx_cast",
+    "bugs": "https://github.com/hensm/fx_cast",
+
     "scripts": {
         "postinstall": "npm run postinstall:app && npm run postinstall:ext",
         "postinstall:app": "npm install ./app --prefix ./app",