From 882baa5f5548a5b30cb873ee01589b60bfe12932 Mon Sep 17 00:00:00 2001
From: Ty Lamontagne <amfobes@gmail.com>
Date: Thu, 12 Sep 2024 17:27:56 -0400
Subject: [PATCH] Use proper semver for the installer version

---
 .github/workflows/create-installer.yml | 9 ++++++++-
 PCSX2 Installer.iss                    | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/create-installer.yml b/.github/workflows/create-installer.yml
index 8b1a29a..84b043e 100644
--- a/.github/workflows/create-installer.yml
+++ b/.github/workflows/create-installer.yml
@@ -44,10 +44,17 @@ jobs:
       run: |
         "C:\Program Files\7-Zip\7z.exe" x -o.\main pcsx2-${{steps.release_download.outputs.tag_name}}-windows-x64-Qt.7z
 
+    - name: Get our version tag
+      shell: bash
+      run: |
+        TAG_NAME=${{ steps.release_download.outputs.tag_name }}
+        VERSION=${TAG_NAME#v}
+        echo "VERSION=$VERSION" >> $GITHUB_ENV
+
     - name: Inject Release Tag into Installer Script
       shell: bash
       run: |
-        sed -i 's/PCSX2_VERSION_STRING/${{steps.release_download.outputs.tag_name}}/g' 'PCSX2 Installer.iss'
+        sed -i 's/PCSX2_VERSION_STRING/'"$VERSION"'/g' 'PCSX2 Installer.iss'
 
     - uses: Minionguyjpro/Inno-Setup-Action@v1.2.2
       name: Build the Release
diff --git a/PCSX2 Installer.iss b/PCSX2 Installer.iss
index 9587453..e8c4823 100644
--- a/PCSX2 Installer.iss	
+++ b/PCSX2 Installer.iss	
@@ -3,7 +3,7 @@
 
 #define MyAppName "PCSX2"
 
-; Automatically changed by the GitHub action. An example would be "v2.0.0"
+; Automatically changed by the GitHub action. An example would be "2.0.0"
 #define MyAppVersion "PCSX2_VERSION_STRING"
 #define MyAppPublisher "PCSX2 Team"
 #define MyAppURL "https:/pcsx2.net/"
@@ -35,7 +35,7 @@ DefaultGroupName={#MyAppName}
 DefaultDirName={commonpf64}\{#MyAppName}
 
 OutputDir=PCSX2
-OutputBaseFilename={#MyAppName}-{#MyAppVersion}-windows-x64-installer
+OutputBaseFilename={#MyAppName}-v{#MyAppVersion}-windows-x64-installer
 
 ; InfoAfterFile=README.txt
 UninstallDisplayIcon={app}\{#MyAppExeName},0