From 33bf238ba4eed03d50248d705cee00d3f89e91ff Mon Sep 17 00:00:00 2001
From: theofficialgman <28281419+theofficialgman@users.noreply.github.com>
Date: Fri, 28 Jul 2023 21:17:56 -0400
Subject: [PATCH] KeePassXC: use distro version for bookworm and any
 unrecognized version

work towards https://github.com/Botspot/pi-apps/issues/2401

long term we still need to update keepassxc for buster/bullseye https://github.com/Botspot/pi-apps/issues/2160 . Potentially may be able to use near equivalent from the ubuntu PPA for these debian releases
---
 apps/KeePassXC/install-32 | 13 +++++++++----
 apps/KeePassXC/install-64 | 13 +++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/apps/KeePassXC/install-32 b/apps/KeePassXC/install-32
index dfc976eb5f..1f8aa70da5 100755
--- a/apps/KeePassXC/install-32
+++ b/apps/KeePassXC/install-32
@@ -1,15 +1,20 @@
 #!/bin/bash
 
 case $(get_codename) in
-bionic|focal|jammy|kinetic)
-  apt_lock_wait
-  sudo add-apt-repository ppa:phoerious/keepassxc -y
+bionic|focal|jammy|kinetic|lunar)
+  ubuntu_ppa_installer "phoerious/keepassxc"
+  install_packages keepassxc || exit 1
+  ;;
+bookworm|trixie|sid|mantic)
   install_packages keepassxc || exit 1
   ;;
 bullseye)
   install_packages https://github.com/Pi-Apps-Coders/files/raw/main/keepassxc_2.6.6-1_armhf.deb || exit 1
   ;;
-*)
+buster)
   install_packages https://github.com/ryanfortner/ryanfortner/releases/download/1002/keepassxc_2.6.6-5_armhf.deb || exit 1
   ;;
+*)
+  install_packages keepassxc || exit 1
+  ;;
 esac
diff --git a/apps/KeePassXC/install-64 b/apps/KeePassXC/install-64
index 73fc839cf2..57055c7a70 100755
--- a/apps/KeePassXC/install-64
+++ b/apps/KeePassXC/install-64
@@ -1,15 +1,20 @@
 #!/bin/bash
 
 case $(get_codename) in
-bionic|focal|jammy|kinetic)
-  apt_lock_wait
-  sudo add-apt-repository ppa:phoerious/keepassxc -y
+bionic|focal|jammy|kinetic|lunar)
+  ubuntu_ppa_installer "phoerious/keepassxc"
+  install_packages keepassxc || exit 1
+  ;;
+bookworm|trixie|sid|mantic)
   install_packages keepassxc || exit 1
   ;;
 bullseye)
   install_packages https://github.com/Pi-Apps-Coders/files/raw/main/keepassxc_2.6.6-1_arm64.deb || exit 1
   ;;
-*)
+buster)
   install_packages https://github.com/ryanfortner/ryanfortner/releases/download/1002/keepassxc_2.6.6-5_arm64.deb || exit 1
   ;;
+*)
+  install_packages keepassxc || exit 1
+  ;;
 esac