From 636bdb8442cb714c2f0cf3b9422a49d2797fef0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Jaro=C5=A1?= <hello@romanjaros.dev>
Date: Sat, 8 Mar 2025 21:03:17 +0100
Subject: [PATCH] Fix release zip folder structure

---
 Jenkinsfile | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 10fdfd4..dc9d0c4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,8 +12,8 @@ properties([parameters([
         ),
 ])])
 
-def outputFolder = "Output"
-def addonName = "CzechQuests"
+def output = "Output"
+def addon = "CzechQuests"
 
 def tocFiles = [
         "classic_era": "CzechQuests_Vanilla.toc",
@@ -45,25 +45,27 @@ def createZipFile = { String game ->
     def version = readToCVersion()
 
     // prepare output folder
-    sh "mkdir -p $outputFolder/$addonName/Addon/Data"
+    sh "mkdir -p $output/$addon/Addon/Data"
 
     // copy toc file
-    sh "cp $tocFile $outputFolder/$addonName"
+    sh "cp $tocFile $output/$addon"
 
-    // copy files
-    sh "rsync -av './CzechQuests.lua' ./$outputFolder/$addonName"
-    sh "rsync -av './Addon/Data/other.lua' ./$outputFolder/$addonName/Addon/Data"
-    sh "find ./Addon/Data/$game -name '*.lua' -exec rsync -av {} ./$outputFolder/$addonName/Addon/Data \\;"
-    sh "find ./Addon/Code -name '*.lua' -exec rsync -av {} ./$outputFolder/$addonName/Addon/Code \\;"
-    sh "find . -name '*.tga' -exec rsync -avR {} $outputFolder/$addonName \\;"
-    sh "find . -name '*.ttf' -exec rsync -avR {} $outputFolder/$addonName \\;"
+    // copy lue files
+    sh "rsync -av './CzechQuests.lua' ./$output/$addon"
+    sh "rsync -av './Addon/Data/other.lua' ./$output/$addon/Addon/Data"
+    sh "find ./Addon/Data/$game/ -name '*.lua' -exec rsync -av {} ./$output/$addon/Addon/Data/ \\;"
+    sh "find ./Addon/Code/ -name '*.lua' -exec rsync -av {} ./$output/$addon/Addon/Code/ \\;"
+
+    // copy assets
+    sh "find . -name '*.tga' -exec rsync -avR {} $output/$addon \\;"
+    sh "find . -name '*.ttf' -exec rsync -avR {} $output/$addon \\;"
 
     // create zip
     def zipFileName = "czech-quests-$game-v${version}.zip"
-    zip zipFile: zipFileName, archive: false, dir: outputFolder
+    zip zipFile: zipFileName, archive: false, dir: output
 
     // remove build folder
-    sh "rm -r $outputFolder"
+    sh "rm -r $output"
 }
 
 def pushToGit = { ->