From 6cae898aa132a5af272b570dc6219064d6c5d22a Mon Sep 17 00:00:00 2001
From: sim0n00ps <simoncoops64@gmail.com>
Date: Sun, 4 May 2025 18:11:44 +0100
Subject: [PATCH] Tweak again

---
 .gitea/workflows/publish-release.yml | 67 +++++++++++++---------------
 1 file changed, 30 insertions(+), 37 deletions(-)

diff --git a/.gitea/workflows/publish-release.yml b/.gitea/workflows/publish-release.yml
index c8f8196..bab45b9 100644
--- a/.gitea/workflows/publish-release.yml
+++ b/.gitea/workflows/publish-release.yml
@@ -38,55 +38,48 @@ jobs:
 
       - name: Copy and patch extra files
         run: |
-          echo "➤ Copying rules.json"
           cp ./OF\ DL/rules.json outwin/
-
-          echo "➤ Making binary executable"
           chmod +x ./outlin/OF\ DL
-
-          echo "➤ Running binary briefly"
           cd outwin
+
+          echo "➤ Running OF DL binary (timeout)"
           timeout --preserve-status --kill-after=5s 30s ../outlin/OF\ DL --non-interactive || true
           echo "➤ Binary finished"
 
-          echo "➤ Creating folder for CDM"
+          echo "➤ Preparing ffmpeg"
           mkdir -p cdm/devices/chrome_1610
-
-          echo "➤ Downloading ffmpeg"
           wget https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-essentials.zip -O ffmpeg.zip
-          echo "➤ Download complete"
 
-          echo "➤ Unzipping ffmpeg"
-          unzip -o -q ffmpeg.zip || { echo "Unzip failed"; ls -al; exit 1; }
-          echo "➤ Unzip complete"
+          sudo apt update && sudo apt install -y p7zip-full
+          echo "➤ Extracting with 7z"
+          7z x ffmpeg.zip -obin -y > /dev/null
 
-          echo "➤ Moving ffmpeg.exe and LICENSE"
-          mv ffmpeg*/bin/ffmpeg.exe .
-          mv ffmpeg*/LICENSE LICENSE.ffmpeg
+          echo "➤ Moving files"
+          find bin -iname ffmpeg.exe -exec mv {} . \;
+          find bin -iname LICENSE -exec mv {} LICENSE.ffmpeg
 
-          echo "➤ Zipping final release"
+          echo "➤ Creating release zip"
           zip ../OFDLV${{ steps.version.outputs.version }}.zip OF\ DL.exe e_sqlite3.dll rules.json config.conf cdm ffmpeg.exe LICENSE.ffmpeg
-          echo "➤ Zip complete"
           cd ..
 
-      - name: Create Gitea release
-        uses: ./.gitea-actions/create-release
-        with:
-          tag_name: ${{ gitea.ref }}
-          release_name: ${{ steps.version.outputs.version }}
-          draft: true
-          prerelease: false
-        env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
-          GITEA_REPOSITORY: ${{ gitea.repository }}
-          GITEA_SERVER_URL: ${{ gitea.server_url }}
+            - name: Create Gitea release
+              uses: ./.gitea-actions/create-release
+              with:
+                tag_name: ${{ gitea.ref }}
+                release_name: ${{ steps.version.outputs.version }}
+                draft: true
+                prerelease: false
+              env:
+                GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+                GITEA_REPOSITORY: ${{ gitea.repository }}
+                GITEA_SERVER_URL: ${{ gitea.server_url }}
 
-      - name: Upload release asset
-        uses: ./.gitea-actions/upload-release-asset
-        with:
-          upload_url: ${{ steps.create-release.outputs.upload_url }}
-          asset_path: ./OFDLV${{ steps.version.outputs.version }}.zip
-          asset_name: OFDLV${{ steps.version.outputs.version }}.zip
-          asset_content_type: application/zip
-        env:
-          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+            - name: Upload release asset
+              uses: ./.gitea-actions/upload-release-asset
+              with:
+                upload_url: ${{ steps.create-release.outputs.upload_url }}
+                asset_path: ./OFDLV${{ steps.version.outputs.version }}.zip
+                asset_name: OFDLV${{ steps.version.outputs.version }}.zip
+                asset_content_type: application/zip
+              env:
+                GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}