From b58d080f4dbcde6dbc97a3b57bad8993efd4c8f2 Mon Sep 17 00:00:00 2001
From: OMGeeky <>
Date: Sun, 16 Feb 2025 01:07:44 +0100
Subject: [PATCH] Update installer script and release workflow to improve
 version handling

---
 .github/workflows/release.yml        | 23 +++++++++--------------
 packaging/Windows/ATCS_Installer.nsi | 12 ++++++------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5ff9e71..c91ce95 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
       run: |
         echo "Reading version from file:"
         cat packaging/ATCS_latest
-        VERSION=$(cat packaging/ATCS_latest | sed 's/^v//' | sed 's/[^0-9.]//g')
+        VERSION=$(cat packaging/ATCS_latest)
         echo "Processed version: $VERSION"
         echo "VERSION=$VERSION" >> $GITHUB_ENV
         echo "Environment variable set to: $VERSION"
@@ -30,6 +30,11 @@ jobs:
 
     - name: Install NSIS
       uses: joncloud/makensis-action@v4
+      env:
+        VERSION: ${{ env.VERSION }}
+      with:
+        script-file: packaging/Windows/ATCS_Installer.nsi
+        arguments: /DVERSION="${{ env.VERSION }}"
 
     - name: Build JAR
       shell: bash
@@ -39,18 +44,8 @@ jobs:
         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: |
-        cd packaging/Windows
-        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
+        ls -la ATCS_${{ env.VERSION }}.zip
 
     - name: Upload ZIP to Release
       uses: actions/upload-release-asset@v1
@@ -68,6 +63,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ./packaging/Windows/ATCS_v${{ env.VERSION }}_Setup.exe
-        asset_name: ATCS_v${{ env.VERSION }}_Setup.exe
+        asset_path: ./packaging/ATCS_${{ env.VERSION }}_Setup.exe
+        asset_name: ATCS_${{ env.VERSION }}_Setup.exe
         asset_content_type: application/octet-stream
diff --git a/packaging/Windows/ATCS_Installer.nsi b/packaging/Windows/ATCS_Installer.nsi
index 3780f4d..b671470 100644
--- a/packaging/Windows/ATCS_Installer.nsi
+++ b/packaging/Windows/ATCS_Installer.nsi
@@ -1,12 +1,12 @@
 !include MUI2.nsh
 
-; Version will be passed as /DVERSION=x.x.x
+; Version will be passed as /DVERSION=vx.x.x
 !define TRAINER_VERSION "0.1.5"
 !define JAVA_BIN "java"
 !define ATCS_SOURCE_DIR "..\..\"
 
-Name "Andor's Trail Content Studio v${VERSION}"
-OutFile "ATCS_v${VERSION}_Setup.exe"
+Name "Andor's Trail Content Studio ${VERSION}"
+OutFile "..\ATCS_${VERSION}_Setup.exe"
 InstallDir "$PROGRAMFILES\ATCS\"
 
 ;SetCompressor /SOLID /FINAL lzma
@@ -14,10 +14,10 @@ InstallDir "$PROGRAMFILES\ATCS\"
 Var StartMenuFolder
 
 !define MUI_WELCOMEPAGE_TITLE "Welcome to Andor's Trail Content Studio installer"
-!define MUI_WELCOMEPAGE_TEXT "This will install Andor's Trail Content Studio v${VERSION}"
-!define MUI_FINISHPAGE_TEXT "Andor's Trail Content Studio v${VERSION} - Install completed !"
+!define MUI_WELCOMEPAGE_TEXT "This will install Andor's Trail Content Studio ${VERSION}"
+!define MUI_FINISHPAGE_TEXT "Andor's Trail Content Studio ${VERSION} - Install completed !"
 !define MUI_STARTMENUPAGE_DEFAULTFOLDER "Andor's Trail Content Studio"
-!define MUI_PAGE_HEADER_TEXT "Installing Andor's Trail Content Studio v${VERSION}"
+!define MUI_PAGE_HEADER_TEXT "Installing Andor's Trail Content Studio ${VERSION}"
 
 
 ;Start Menu Folder Page Configuration