Merge branch 'testing' into unstable

ublue-os · Feb 3, 2025 · e58b1ee · e58b1ee
2 parents 16bf60d + 3d860f7
commit e58b1ee
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-apps.just
@@ -151,15 +151,30 @@ install-opentabletdriver:
     #!/usr/bin/bash
     source /usr/lib/ujust/ujust.sh
     echo "Installing OpenTabletDriver..."
+    curl -s https://api.github.com/repos/OpenTabletDriver/OpenTabletDriver/releases/latest \
+    | jq -r '.assets | sort_by(.created_at) | .[] | select (.name|test("opentabletdriver.*tar.gz$")) | .browser_download_url' \
+    | wget -qi - -O /tmp/OpenTabletDriver/opentabletdriver.tar.gz && \
+    tar --strip-components=1 -xvzf /tmp/OpenTabletDriver/opentabletdriver.tar.gz -C /tmp/OpenTabletDriver && \
+    sudo cp /tmp/OpenTabletDriver/etc/udev/rules.d/70-opentabletdriver.rules /etc/udev/rules.d/71-opentabletdriver.rules && \
+    rm -rf /tmp/OpenTabletDriver && \
     flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo && \
     flatpak --system install -y flathub net.opentabletdriver.OpenTabletDriver && \
     mkdir -p $HOME/.config/OpenTabletDriver && \
     flatpak override --user --filesystem=xdg-config/OpenTabletDriver net.opentabletdriver.OpenTabletDriver && \
     mkdir -p $HOME/.config/systemd/user && \
     curl -s https://raw.githubusercontent.com/flathub/net.opentabletdriver.OpenTabletDriver/refs/heads/master/scripts/opentabletdriver.service > $HOME/.config/systemd/user/opentabletdriver.service  && \
     systemctl --user daemon-reload && \
-    systemctl enable --user --now arch-opentabletdriver.service && \
-    distrobox enter -n arch -- bash -c 'distrobox-export --app otd-gui'
+    systemctl enable --user --now opentabletdriver.service
+
+# Remove OpenTabletDriver
+remove-opentabletdriver:
+    #!/usr/bin/bash
+    source /usr/lib/ujust/ujust.sh
+    echo "Uninstalling OpenTabletDriver..."
+    sudo -A rm /etc/udev/rules.d/71-opentabletdriver.rules && \
+    flatpak --system remove -y flathub net.opentabletdriver.OpenTabletDriver && \ 
+    systemctl disable --user --now opentabletdriver.service
+
 
 # Install Docker, a platform designed to help developers build, share, and run container applications
 install-docker: