From 2e3a231a30a4c1ed7a869dd4128318572d9fa596 Mon Sep 17 00:00:00 2001
From: wheaney <42350981+wheaney@users.noreply.github.com>
Date: Thu, 12 Feb 2026 21:56:39 -0800
Subject: [PATCH] Fix various issues with the split libs scripts

---
 VERSION                |  2 +-
 bin/breezy_gnome_setup |  6 +++---
 bin/breezy_kwin_setup  | 22 ++++------------------
 bin/package_kwin       |  6 ++++--
 4 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/VERSION b/VERSION
index 834f262..dbe5900 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.8.0
+2.8.1
diff --git a/bin/breezy_gnome_setup b/bin/breezy_gnome_setup
index 0baa6ab..7208d85 100755
--- a/bin/breezy_gnome_setup
+++ b/bin/breezy_gnome_setup
@@ -83,7 +83,7 @@ fi
 if [ -z "$binary_path_arg" ]
 then
   # download and unzip the binary
-  binary_path_arg = "$FILE_NAME"
+  binary_path_arg="$FILE_NAME"
   echo "Downloading to: ${tmp_dir}/$binary_path_arg"
   
   curl -L "$binary_download_url" > "$binary_path_arg"
@@ -94,9 +94,9 @@ fi
 echo "Extracting to: ${tmp_dir}/breezy_gnome"
 tar -xf $(basename $binary_path_arg)
 
-if [ -z "lib_path_arg" ]
+if [ -z "$lib_path_arg" ]
 then
-  lib_path_arg = "$FILE_NAME"
+  lib_path_arg="$LIBS_FILE_NAME"
   echo "Downloading to: ${tmp_dir}/$lib_path_arg"
 
   curl -L "$libs_download_url" > "$lib_path_arg"
diff --git a/bin/breezy_kwin_setup b/bin/breezy_kwin_setup
index 6e3e31c..3cc68d2 100755
--- a/bin/breezy_kwin_setup
+++ b/bin/breezy_kwin_setup
@@ -175,24 +175,9 @@ then
       exit $pkgkwin_rc
     fi
     FILE_NAME="breezyKWin-$ARCH.tar.gz"
-    cp "out/$FILE_NAME" "$tmp_dir"
     binary_path_arg="$FILE_NAME"
+    cp "out/$binary_path_arg" "$tmp_dir"
     popd > /dev/null
-
-    # For source builds, we may not have a published Breezy libs artifact.
-    # Fetch the XR driver libs directly and wrap them in the expected Breezy libs archive format.
-    xr_libs_url="https://github.com/wheaney/XRLinuxDriver/releases/latest/download/xrDriver-libs-$LIBS_ARCH.tar.gz"
-    echo "Downloading to: ${tmp_dir}/xrDriver-libs-$LIBS_ARCH.tar.gz"
-    curl -L "$xr_libs_url" -o "${tmp_dir}/xrDriver-libs-$LIBS_ARCH.tar.gz"
-
-    tmp_lib_dir=$(mktemp -d -t breezy-kwin-libs-XXXXXXXXXX)
-    mkdir -p "$tmp_lib_dir/breezy_desktop_lib"
-    mv "${tmp_dir}/xrDriver-libs-$LIBS_ARCH.tar.gz" "$tmp_lib_dir/breezy_desktop_lib/"
-    echo "Creating ${tmp_dir}/$LIBS_FILE_NAME"
-    tar -zcvf "${tmp_dir}/$LIBS_FILE_NAME" -C "$tmp_lib_dir" "breezy_desktop_lib" > /dev/null
-    rm -rf "$tmp_lib_dir"
-
-    lib_path_arg="$LIBS_FILE_NAME"
   fi
 else
   cp "$binary_path_arg" "$tmp_dir"
@@ -200,9 +185,10 @@ fi
 
 if [ -z "$lib_path_arg" ]
 then
-  echo "Downloading to: ${tmp_dir}/$LIBS_FILE_NAME"
-  curl -L "$libs_download_url" -o "$LIBS_FILE_NAME"
   lib_path_arg="$LIBS_FILE_NAME"
+  echo "Downloading to: ${tmp_dir}/$lib_path_arg"
+
+  curl -L "$libs_download_url" -o "$lib_path_arg"
 else
   cp "$lib_path_arg" "$tmp_dir"
 fi
diff --git a/bin/package_kwin b/bin/package_kwin
index 1a51942..6e07f7b 100755
--- a/bin/package_kwin
+++ b/bin/package_kwin
@@ -31,9 +31,11 @@ copy_and_inject_ua "$XR_DRIVER_DIR/bin/ua.sh" "$PACKAGE_DIR/bin" "$KWIN_DIR/bin/
 
 XR_DRIVER_BINARY_NAME=xrDriver-$ARCH.tar.gz
 XR_DRIVER_BINARY="$XR_DRIVER_DIR/out/$XR_DRIVER_BINARY_NAME"
+
+XR_DRIVER_VERSION=$(sed -nE 's/^project\([^)]*VERSION[[:space:]]+([0-9]+\.[0-9]+\.[0-9]+).*$/\1/p' "$XR_DRIVER_DIR/CMakeLists.txt" | head -n 1)
 if [ "$1" == "--download-driver" ]; then
-  driver_download_url="https://github.com/wheaney/XRLinuxDriver/releases/latest/download/xrDriver-$ARCH.tar.gz"
-  setup_download_url="https://github.com/wheaney/XRLinuxDriver/releases/latest/download/xr_driver_setup"
+  driver_download_url="https://github.com/wheaney/XRLinuxDriver/releases/download/v$XR_DRIVER_VERSION/xrDriver-$ARCH.tar.gz"
+  setup_download_url="https://github.com/wheaney/XRLinuxDriver/releases/download/v$XR_DRIVER_VERSION/xr_driver_setup"
 
   curl -L "$driver_download_url" > "$PACKAGE_DIR/$XR_DRIVER_BINARY_NAME"
   curl -L "$setup_download_url" > "$PACKAGE_DIR/bin/xr_driver_setup"