Reorder NSIS installation step in release workflow

.github/workflows/release.yml

@@ -11,34 +11,41 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
+    - name: Get Version
+      id: get_version
+      shell: bash
+      run: |
+        echo "Reading version from file:"
+        cat packaging/ATCS_latest
+        VERSION=$(cat packaging/ATCS_latest)
+        echo "Processed version: $VERSION"
+        echo "VERSION=$VERSION" >> $GITHUB_ENV
+        echo "Environment variable set to: $VERSION"
+
     - name: Set up JDK
       uses: actions/setup-java@v2
       with:
         java-version: '11'
         distribution: 'adopt'
 
-    - name: Install NSIS
-      uses: joncloud/makensis-action@v4
-
     - name: Build JAR
       shell: bash
       run: |
-        cd ATCS/packaging
+        cd packaging
         chmod +x package.sh
+        echo "Building JAR and ZIP for version: ${{ env.VERSION }}"
         ./package.sh -windows
+        echo "Created artifacts:"
+        ls -la common/ATCS.jar
+        ls -la ATCS_${{ env.VERSION }}.zip
 
-    - name: Create Installer
-      shell: bash
-      run: |
-        cd ATCS/packaging/Windows
-        makensis ATCS_Installer.nsi
-
-    - name: Get Version
-      id: get_version
-      shell: bash
-      run: |
-        VERSION=$(cat ATCS/packaging/ATCS_latest | sed 's/^v//')
-        echo "VERSION=$VERSION" >> $GITHUB_ENV
+    - 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: Upload ZIP to Release
       uses: actions/upload-release-asset@v1
@@ -46,7 +53,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ./ATCS/packaging/ATCS_${{ env.VERSION }}.zip
+        asset_path: ./packaging/ATCS_${{ env.VERSION }}.zip
         asset_name: ATCS_${{ env.VERSION }}.zip
         asset_content_type: application/zip
 
@@ -56,6 +63,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ github.event.release.upload_url }}
-        asset_path: ./ATCS/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

packaging/Windows/ATCS_Installer.nsi

@@ -1,13 +1,12 @@
 !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=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
@@ -15,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