From 3a41932561711a23447fe498ce1ed0b970a3c61c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 20 May 2024 16:42:23 +0200 Subject: [PATCH] Use standard redis helpers --- manifest.toml | 2 +- scripts/_common.sh | 38 -------------------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/manifest.toml b/manifest.toml index 530b71d..41e74cc 100644 --- a/manifest.toml +++ b/manifest.toml @@ -21,7 +21,7 @@ userdoc = "https://help.penpot.app/user-guide/" code = "https://github.com/penpot/penpot" [integration] -yunohost = '>= 11.2' +yunohost = '>= 11.2.12' architectures = ["amd64", "arm64"] multi_instance = true ldap = false diff --git a/scripts/_common.sh b/scripts/_common.sh index 22e0813..419bb63 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,41 +12,3 @@ build_date="Mon, 18 Sep 2023 09:14:03 +0000" #================================================= # PERSONAL 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 -}