From 6132a978d3ceb31837e2217f56390d81c7b7ed49 Mon Sep 17 00:00:00 2001
From: vhsdream <punk.sand7393@fastmail.com>
Date: Sun, 7 Dec 2025 11:44:44 -0500
Subject: [PATCH] Restore manual method of configuring Collabora repo

- The collaboraonline.sources file cannot have a Component entry
---
 install/opencloud-install.sh | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/install/opencloud-install.sh b/install/opencloud-install.sh
index cd177117..d6d7fc49 100644
--- a/install/opencloud-install.sh
+++ b/install/opencloud-install.sh
@@ -26,15 +26,23 @@ if [[ "$wopi_host" ]]; then
   WOPI_HOST="$wopi_host"
 fi
 
-# Collabora online
-setup_deb822_repo \
-  "collaboraonline" \
-  "https://collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg" \
-  "https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-deb/Release" \
-  "./" \
-  "main"
+# Collabora online - this is broken because it adds the Component and apt doesn't like that
+# setup_deb822_repo \
+#   "collaboraonline" \
+#   "https://collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg" \
+#   "https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-deb/Release" \
+#   "./" \
+#   "main"
 
 msg_info "Installing Collabora Online"
+curl -fsSL https://collaboraoffice.com/downloads/gpg/collaboraonline-release-keyring.gpg -o /etc/apt/keyrings/collaboraonline-release-keyring.gpg
+cat <<EOF >/etc/apt/sources.list.d/colloboraonline.sources
+Types: deb
+URIs: https://www.collaboraoffice.com/repos/CollaboraOnline/CODE-deb
+Suites: ./
+Signed-By: /etc/apt/keyrings/collaboraonline-release-keyring.gpg
+EOF
+$STD apt-get update
 $STD apt-get install -y coolwsd code-brand
 systemctl stop coolwsd
 COOLPASS="$(openssl rand -base64 36)"