From 32930038b3b33844d435db5b0f2e50adf11ecb8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 20 May 2024 16:34:49 +0200 Subject: [PATCH] Use standard redis helpers --- manifest.toml | 3 +-- scripts/_common.sh | 35 ----------------------------------- 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/manifest.toml b/manifest.toml index b571c34..cf9d079 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ demo = "https://libremdb.iket.me/about" code = "https://github.com/zyachel/libremdb" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.12" architectures = "all" multi_instance = true @@ -57,4 +57,3 @@ ram.runtime = "50M" extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main" extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg" extras.yarn.packages = "yarn" - \ No newline at end of file diff --git a/scripts/_common.sh b/scripts/_common.sh index 4ebfa3b..b998ffe 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -20,38 +20,3 @@ nodejs_version=18 #================================================= # 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" -} - -# usage: ynh_redis_remove_db database -# | arg: database - the database to erase -ynh_redis_remove_db() { - local db=$1 - redis-cli -n "$db" flushall -}