From 765e00446e744a1db59fef9d6f97d766039b2ee9 Mon Sep 17 00:00:00 2001
From: Samuel Sloniker <sam@kj7rrv.com>
Date: Tue, 30 Jul 2024 10:05:32 -0700
Subject: [PATCH] Improve Windows installer

---
 build-windows.ps1     | 13 ++++++++-----
 windows_installer.nsi | 22 ++++++----------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/build-windows.ps1 b/build-windows.ps1
index e3db9a4..504b8e1 100644
--- a/build-windows.ps1
+++ b/build-windows.ps1
@@ -1,11 +1,14 @@
-pyinstaller --icon "icon.ico" --windowed --onefile --hidden-import "tornado.web" --add-data "icon.ico:files" --add-data "README.md:files" --add-data "GPL-3.0.txt:files" --add-data "CC-BY-SA-4.0.txt:files" --name "navpoint.exe" "main.py"
-& "C:\Program Files (x86)\NSIS\makensis.exe" ".\windows_installer.nsi"
-
 $version = (Get-Content -Path README.md -TotalCount 1).Split()[3]
-
 $distName = "navpoint-$version-windows-$env:PROCESSOR_ARCHITECTURE"
 
 Remove-Item -Path "dist\$distName-*"
 
+pyinstaller --icon "icon.ico" --windowed --onefile --hidden-import "tornado.web" --add-data "icon.ico:files" --add-data "README.md:files" --add-data "GPL-3.0.txt:files" --add-data "CC-BY-SA-4.0.txt:files" --name "navpoint.exe" "main.py"
+
+(Get-Content ".\windows_installer.nsi" -Raw).Replace("<<version>>", "$version").Replace("<<distName>>", "$distName") | Out-File ".\temp_installer.nsi"
+& "C:\Program Files (x86)\NSIS\makensis.exe" ".\temp_installer.nsi"
+Remove-Item -Path ".\temp_installer.nsi"
+
 Move-Item -Path "dist\navpoint.exe" -Destination "dist\$distName-portable.exe"
-Move-Item -Path "dist\NavpointInstaller.exe" -Destination "dist\$distName-installer.exe"
+
+# Move-Item -Path "dist\NavpointInstaller.exe" -Destination "dist\$distName-installer.exe"
diff --git a/windows_installer.nsi b/windows_installer.nsi
index 0ed8489..7d734d9 100644
--- a/windows_installer.nsi
+++ b/windows_installer.nsi
@@ -1,5 +1,5 @@
-OutFile "dist\NavpointInstaller.exe"
-# define installation directory
+Name "Navpoint <<version>>"
+OutFile "dist\<<distName>>-installer.exe"
 InstallDir $PROFILE\Navpoint
 
 RequestExecutionLevel user
@@ -9,25 +9,15 @@ Section
     SetOutPath $INSTDIR
 
     File dist\navpoint.exe
- 
-    # create the uninstaller
-    WriteUninstaller "$INSTDIR\uninstall.exe"
- 
-    # create a shortcut named "new shortcut" in the start menu programs directory
-    # point the new shortcut at the program uninstaller
-    CreateShortcut "$SMPROGRAMS\Uninstall Navpoint.lnk" "$INSTDIR\uninstall.exe"
     CreateShortcut "$SMPROGRAMS\Navpoint.lnk" "$INSTDIR\navpoint.exe"
+    CreateShortcut "$DESKTOP\Navpoint.lnk" "$INSTDIR\navpoint.exe"
+ 
+    WriteUninstaller "$INSTDIR\uninstall.exe"
+    CreateShortcut "$SMPROGRAMS\Uninstall Navpoint.lnk" "$INSTDIR\uninstall.exe"
 SectionEnd
  
-# uninstaller section start
 Section "uninstall"
- 
-    # Remove the link from the start menu
     Delete "$SMPROGRAMS\Uninstall Navpoint.lnk"
- 
-    # Delete the uninstaller
     Delete $INSTDIR\uninstaller.exe
- 
     RMDir $INSTDIR
-# uninstaller section end
 SectionEnd