From a2640c2da080336310d8a0b917b0cc44a20bf009 Mon Sep 17 00:00:00 2001
From: OMGeeky <>
Date: Sun, 16 Feb 2025 00:57:27 +0100
Subject: [PATCH] Update installer script and release workflow to use dynamic
 versioning

---
 .github/workflows/release.yml        | 18 +++++++++---------
 packaging/Windows/ATCS_Installer.nsi |  3 +--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b330205..5ff9e71 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,10 +15,9 @@ jobs:
       id: get_version
       shell: bash
       run: |
-        pwd
         echo "Reading version from file:"
         cat packaging/ATCS_latest
-        VERSION=$(cat packaging/ATCS_latest | sed 's/^v//')
+        VERSION=$(cat packaging/ATCS_latest | sed 's/^v//' | sed 's/[^0-9.]//g')
         echo "Processed version: $VERSION"
         echo "VERSION=$VERSION" >> $GITHUB_ENV
         echo "Environment variable set to: $VERSION"
@@ -35,22 +34,23 @@ jobs:
     - name: Build JAR
       shell: bash
       run: |
-        pwd
         cd packaging
-        pwd
         chmod +x package.sh
+        echo "Building JAR and ZIP for version: ${{ env.VERSION }}"
         ./package.sh -windows
+        echo "Created artifacts:"
+        ls -la ATCS_${{ env.VERSION }}.zip
+        ls -la common/ATCS.jar
 
     - name: Create Installer
       shell: bash
       run: |
-        pwd
         cd packaging/Windows
-        pwd
-        ls -la
-        makensis ATCS_Installer.nsi
-        echo "Checking installer artifacts:"
         ls -la
+        echo "Building installer for version: ${{ env.VERSION }}"
+        makensis /DVERSION="${{ env.VERSION }}" ATCS_Installer.nsi
+        echo "Created installer:"
+        ls -la ATCS_v${{ env.VERSION }}_Setup.exe
 
     - name: Upload ZIP to Release
       uses: actions/upload-release-asset@v1
diff --git a/packaging/Windows/ATCS_Installer.nsi b/packaging/Windows/ATCS_Installer.nsi
index 42f5f8f..3780f4d 100644
--- a/packaging/Windows/ATCS_Installer.nsi
+++ b/packaging/Windows/ATCS_Installer.nsi
@@ -1,7 +1,6 @@
 !include MUI2.nsh
 
-!system 'for /f "delims=" %%a in ('type ..\ATCS_latest') do set "VERSION=%%a" && exit'
-!define VERSION "$%VERSION:~1%"
+; Version will be passed as /DVERSION=x.x.x
 !define TRAINER_VERSION "0.1.5"
 !define JAVA_BIN "java"
 !define ATCS_SOURCE_DIR "..\..\"