Use same method of ensuring vars reach packaging files

blackboxaudio · Nov 18, 2024 · 450ce8a · 450ce8a
1 parent a621b6f
commit 450ce8a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/reusable.package.yml b/.github/workflows/reusable.package.yml
@@ -77,7 +77,7 @@ jobs:
         if: ${{ runner.os == 'macOS' }}
         run: |
           PKGPROJ_FILE="packaging/$PLUGIN_NAME.pkgproj"
-          sed -i.bak "s/{{VERSION}}/$PLUGIN_VERSION/g" "$PKGPROJ_FILE"
+          sed -i "s/{{PLUGIN_VERSION}}/$PLUGIN_VERSION/g" "$PKGPROJ_FILE"
           packagesbuild "$PKGPROJ_FILE"
 
       - name: Sign Installer (MacOS)
@@ -135,6 +135,11 @@ jobs:
       - name: Build Installer (Windows)
         if: ${{ runner.os == 'Windows' }}
         run: |
+          ISS_FILE="packaging/$PLUGIN_NAME.iss"
+          sed -i "s/{{PLUGIN_NAME}}/$PLUGIN_NAME/g" "$ISS_FILE"
+          sed -i "s/{{PLUGIN_VERSION}}/$PLUGIN_VERSION/g" "$ISS_FILE"
+          sed -i "s/{{COMPANY_NAME}}/$COMPANY_NAME/g" "$ISS_FILE"
+          
           iscc "packaging\${{ env.PLUGIN_NAME }}.iss"
           mv "packaging\Output\${{ env.INSTALLER_NAME }}.exe" .
 

diff --git a/packaging/Rotor.iss b/packaging/Rotor.iss
@@ -1,6 +1,6 @@
-#define PluginName GetEnv('PLUGIN_NAME')
-#define Version GetEnv('PLUGIN_VERSION')
-#define Publisher GetEnv('COMPANY_NAME')
+#define PluginName {{PLUGIN_NAME}}
+#define Version {{PLUGIN_VERSION}}
+#define Publisher {{COMPANY_NAME}}
 #define Year GetDateTimeString("yyyy","","")
 
 [Setup]

diff --git a/packaging/Rotor.pkgproj b/packaging/Rotor.pkgproj
@@ -582,7 +582,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>{{VERSION}}</string>
+				<string>{{PLUGIN_VERSION}}</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -1152,7 +1152,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>{{VERSION}}</string>
+				<string>{{PLUGIN_VERSION}}</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>