From 21981d966dc92b7b953b5cdc4bc2525cb8c6e36d Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Wed, 10 Apr 2024 23:29:40 +0200
Subject: [PATCH] [fix] Bookworm install

---
 manifest.toml      | 16 ++++++++++++++--
 scripts/_common.sh |  8 +++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 2ae9754..ffaedda 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Borg Server"
 description.en = "Offer backup storage to a friend"
 description.fr = "Offrez un espace de stockage à un⋅e ami⋅e"
 
-version = "1.2.6~ynh1"
+version = "1.2.8~ynh1"
 
 maintainers = ["ljf"]
 
@@ -61,4 +61,16 @@ ram.runtime = "50M"
     [resources.permissions]
 
     [resources.apt]
-    packages = "python3-pip, python3-dev, libacl1-dev, libssl-dev, liblz4-dev, python3-jinja2, python3-setuptools, python3-venv, virtualenv, libfuse-dev, pkg-config"
+    packages = [
+        "python3-pip",
+        "python3-dev",
+        "libacl1-dev",
+        "libssl-dev",
+        "liblz4-dev",
+        "python3-jinja2",
+        "python3-setuptools",
+        "python3-venv",
+        "virtualenv",
+        "libfuse3-dev",
+        "pkg-config",
+    ]
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 6720bb1..7151311 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BORG_VERSION=1.2.6
+BORG_VERSION=1.2.8
 
 # Install borg with pip if borg is not here
 install_borg_with_pip () {
@@ -9,9 +9,11 @@ install_borg_with_pip () {
     fi
     if [ ! -d /opt/borg-env ]; then
         python3 -m venv /opt/borg-env
-        /opt/borg-env/bin/python /opt/borg-env/bin/pip install wheel
+        /opt/borg-env/bin/python /opt/borg-env/bin/pip install pip -U
+        /opt/borg-env/bin/python /opt/borg-env/bin/pip install setuptools -U
+        /opt/borg-env/bin/python /opt/borg-env/bin/pip install wheel -U
         ynh_print_info --message="Installing/compiling borg, this may take some time..."
-        /opt/borg-env/bin/python /opt/borg-env/bin/pip install borgbackup[fuse]==$BORG_VERSION
+        /opt/borg-env/bin/python /opt/borg-env/bin/pip install borgbackup[pyfuse3]==$BORG_VERSION
         echo "#!/bin/bash
     /opt/borg-env/bin/python /opt/borg-env/bin/borg \"\$@\"" > /usr/local/bin/borg
         touch "/opt/borg-env/$(ynh_get_debian_release)"