From a15029981349c28e38c2a15c4e0e5ff4b55d868e Mon Sep 17 00:00:00 2001
From: a2geek <robgreene@gmail.com>
Date: Tue, 28 Jul 2026 14:49:34 -0500
Subject: [PATCH 1/2] Trying to set final package name to include actual
 version (including SNAPSHOT) as well as architecture.

---
 scripts/build-linux-deb.sh    | 2 +-
 scripts/build-macos-dmg.sh    | 2 +-
 scripts/build-windows-msi.ps1 | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/build-linux-deb.sh b/scripts/build-linux-deb.sh
index 7d5a665f..228c2a61 100755
--- a/scripts/build-linux-deb.sh
+++ b/scripts/build-linux-deb.sh
@@ -43,7 +43,7 @@ jpackage \
 # There doesn't appear to be a mechanism to set the output name without
 # changing the application name as well. So we just 'mv' it.
 SRC=$(find . -name "applecommander*.deb")
-DST="AppleCommander-${VERSION}-${ARCH}.deb"
+DST="AppleCommander-${version}-${ARCH}.deb"
 mv -v ${SRC} ${DST}
 
 echo "Done!"
diff --git a/scripts/build-macos-dmg.sh b/scripts/build-macos-dmg.sh
index b9ed1af1..c4939416 100755
--- a/scripts/build-macos-dmg.sh
+++ b/scripts/build-macos-dmg.sh
@@ -42,7 +42,7 @@ jpackage \
 # There doesn't appear to be a mechanism to set the output name without
 # changing the application name as well. So we just 'mv' it.
 SRC="AppleCommander-${VERSION}.dmg"
-DST="AppleCommander-${VERSION}-${ARCH}.dmg"
+DST="AppleCommander-${version}-${ARCH}.dmg"
 mv -v ${SRC} ${DST}
 
 echo "Done!"
diff --git a/scripts/build-windows-msi.ps1 b/scripts/build-windows-msi.ps1
index ca47f6a3..c40f6e7c 100755
--- a/scripts/build-windows-msi.ps1
+++ b/scripts/build-windows-msi.ps1
@@ -46,9 +46,9 @@ jpackage `
   --win-shortcut `
   --win-upgrade-uuid 4ea8ae7d-f155-4c10-af96-467cda0b343f
 
-if ($version -ne $props['version']) {
-  Write-Host "Renaming AppleCommander-${version}.msi to be AppleCommander-$($props['version']).msi to keep versions consistent."
-  Rename-Item -Path "AppleCommander-${version}.msi" -NewName "AppleCommander-$($props['version']).msi"
-}
+$src="AppleCommander-${version}.msi"
+$dst="AppleCommander-$($props['version'])-${arch}.msi"
+Write-Host "Renaming ${src} to be ${dst} to keep versions consistent."
+Rename-Item -Path "${src}" -NewName "${dst}"
 
 Write-Host "Done!"

From 5ebf6f1dee6e660550f155cf5101bd9d905032e2 Mon Sep 17 00:00:00 2001
From: a2geek <robgreene@gmail.com>
Date: Tue, 28 Jul 2026 15:00:09 -0500
Subject: [PATCH 2/2] Decided that the OS should be included.

---
 scripts/build-linux-deb.sh    | 2 +-
 scripts/build-macos-dmg.sh    | 2 +-
 scripts/build-windows-msi.ps1 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/build-linux-deb.sh b/scripts/build-linux-deb.sh
index 228c2a61..b24c5f3e 100755
--- a/scripts/build-linux-deb.sh
+++ b/scripts/build-linux-deb.sh
@@ -43,7 +43,7 @@ jpackage \
 # There doesn't appear to be a mechanism to set the output name without
 # changing the application name as well. So we just 'mv' it.
 SRC=$(find . -name "applecommander*.deb")
-DST="AppleCommander-${version}-${ARCH}.deb"
+DST="AppleCommander-${version}-linux-${ARCH}.deb"
 mv -v ${SRC} ${DST}
 
 echo "Done!"
diff --git a/scripts/build-macos-dmg.sh b/scripts/build-macos-dmg.sh
index c4939416..2f9bdddd 100755
--- a/scripts/build-macos-dmg.sh
+++ b/scripts/build-macos-dmg.sh
@@ -42,7 +42,7 @@ jpackage \
 # There doesn't appear to be a mechanism to set the output name without
 # changing the application name as well. So we just 'mv' it.
 SRC="AppleCommander-${VERSION}.dmg"
-DST="AppleCommander-${version}-${ARCH}.dmg"
+DST="AppleCommander-${version}-mac-${ARCH}.dmg"
 mv -v ${SRC} ${DST}
 
 echo "Done!"
diff --git a/scripts/build-windows-msi.ps1 b/scripts/build-windows-msi.ps1
index c40f6e7c..1cb296a0 100755
--- a/scripts/build-windows-msi.ps1
+++ b/scripts/build-windows-msi.ps1
@@ -47,7 +47,7 @@ jpackage `
   --win-upgrade-uuid 4ea8ae7d-f155-4c10-af96-467cda0b343f
 
 $src="AppleCommander-${version}.msi"
-$dst="AppleCommander-$($props['version'])-${arch}.msi"
+$dst="AppleCommander-$($props['version'])-windows-${arch}.msi"
 Write-Host "Renaming ${src} to be ${dst} to keep versions consistent."
 Rename-Item -Path "${src}" -NewName "${dst}"