From e2b83245d5e59b9814155fdd8a156b99ea10ffca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Mon, 20 May 2024 20:43:14 +0200
Subject: [PATCH] Use standard redis helpers

---
 manifest.toml      |  7 +++----
 scripts/_common.sh | 39 ---------------------------------------
 2 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 8b26ec8..8cf44bd 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,7 +17,7 @@ admindoc = "https://etherpad.org/doc/v2.0.2/"
 code = "https://github.com/ether/etherpad-lite"
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.12"
 architectures = "all"
 multi_instance = true
 
@@ -82,14 +82,13 @@ ram.runtime = "50M"
 
     [resources.apt]
     packages = ""
-    
+
     packages_from_raw_bash = """
           if [[ "$export" == "libreoffice" ]]
-          then 
+          then
               echo "unoconv libreoffice-writer"
           elif [[ "$export" == "abiword" ]]
           then
               echo "abiword"
           fi
     """
-    
\ No newline at end of file
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 2b9094e..184eecc 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -17,42 +17,3 @@ nodejs_version=22
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================
-
-# get the first available redis database
-#
-# usage: ynh_redis_get_free_db
-# | returns: the database number to use
-ynh_redis_get_free_db() {
-    local result max db
-    result="$(redis-cli INFO keyspace)"
-
-    # get the num
-    max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+")
-
-    db=0
-    # default Debian setting is 15 databases
-    for i in $(seq 0 "$max")
-    do
-        if ! echo "$result" | grep -q "db$i"
-        then
-            db=$i
-            break 1
-        fi
-        db=-1
-    done
-
-    test "$db" -eq -1 && ynh_die --message="No available Redis databases..."
-
-    echo "$db"
-}
-
-# Create a master password and set up global settings
-# Please always call this script in install and restore scripts
-#
-# usage: ynh_redis_remove_db database
-# | arg: database - the database to erase
-ynh_redis_remove_db() {
-    local db=$1
-    redis-cli -n "$db" flushall
-}
-