From 4c5f66fd36912a07cd8ebb2d3a973901c1710f5e Mon Sep 17 00:00:00 2001
From: Izzie Walton <izzie@iwalton.com>
Date: Mon, 13 May 2024 19:10:25 -0400
Subject: [PATCH] Fix CI.

---
 .github/workflows/main.yml | 12 ++++--------
 debian-webclient-rules     |  2 +-
 download_webclient.sh      |  4 ++--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 937a73d8..e2febc8b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -85,11 +85,9 @@ jobs:
         7z x mpv.7z
         mkdir mpv
         mv include mpv
+        gendef libmpv-2.dll
         mv libmpv-2.dll mpv/mpv.dll
-        echo "LIBRARY MPV" > mpv.def.fixed
-        echo "EXPORTS" >> mpv.def.fixed
-        cat mpv.def >> mpv.def.fixed
-        mv mpv.def.fixed mpv.def
+        mv libmpv-2.def mpv.def
         mv mpv.def libmpv.dll.a mpv/
         mv mpv build/
       shell: bash
@@ -131,11 +129,9 @@ jobs:
         7z x mpv.7z
         mkdir mpv
         mv include mpv
+        gendef libmpv-2.dll
         mv libmpv-2.dll mpv/mpv.dll
-        echo "LIBRARY MPV" > mpv.def.fixed
-        echo "EXPORTS" >> mpv.def.fixed
-        cat mpv.def >> mpv.def.fixed
-        mv mpv.def.fixed mpv.def
+        mv libmpv-2.def mpv.def
         mv mpv.def libmpv.dll.a mpv/
         mv mpv build/
       shell: bash
diff --git a/debian-webclient-rules b/debian-webclient-rules
index 25f9e3e7..13644c28 100755
--- a/debian-webclient-rules
+++ b/debian-webclient-rules
@@ -7,7 +7,7 @@ override_dh_auto_configure:
 	DOWNLOAD_ONLY=1 ./download_webclient.sh
 	tar -xzf dist.tar.gz
 	mkdir obj-x86_64-linux-gnu
-	mv jellyfin-web_* obj-x86_64-linux-gnu/dist
+	mv jellyfin/jellyfin-web obj-x86_64-linux-gnu/dist
 	dh_auto_configure $@
 
 override_dh_auto_clean:
diff --git a/download_webclient.sh b/download_webclient.sh
index 4445693a..dde6acc5 100755
--- a/download_webclient.sh
+++ b/download_webclient.sh
@@ -31,8 +31,8 @@ function download_compat {
 
 function get_webclient_version {
     curl https://repo.jellyfin.org/files/server/portable/latest-stable/any/ |
-    tr '<>/' '\t' | grep '[0-9]\+\.[0-9]\+\.[0-9]\+' | cut -f 3 | sort -V |
-    sed 's/[^0-9]*\([0-9]\+\.[0-9]\+\.[0-9]\+\)[^0-9]*/\1/g' | tail -n 1
+    tr '<>/' '\t' | grep '[0-9]\+\.[0-9]\+\.[0-9]\+' | cut -f 3 | cut -d_ -f2 |
+    sed 's/\.[a-z][a-z]*//g' | sort -V | tail -n 1
 }
 
 if [[ "$1" == "--gen-fingerprint" ]]