From f0440fbd6be33d7e65547384e11b92989b4e069d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20Mollier?= Date: Thu, 15 Aug 2019 15:00:39 +0200 Subject: [PATCH] Dynamically evaluate proper mariadb-server- --- data/hooks/conf_regen/34-mysql | 2 +- data/hooks/restore/11-conf_ynh_mysql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/hooks/conf_regen/34-mysql b/data/hooks/conf_regen/34-mysql index 9f35fec18..8f7b5455e 100755 --- a/data/hooks/conf_regen/34-mysql +++ b/data/hooks/conf_regen/34-mysql @@ -1,7 +1,7 @@ #!/bin/bash set -e -MYSQL_PKG="mariadb-server-10.1" +MYSQL_PKG="$(dpkg --list | sed -ne 's/^ii \(mariadb-server-[[:digit:].]\+\) .*$/\1/p')" . /usr/share/yunohost/helpers do_pre_regen() { diff --git a/data/hooks/restore/11-conf_ynh_mysql b/data/hooks/restore/11-conf_ynh_mysql index 1336a2cc2..24cdb1e79 100644 --- a/data/hooks/restore/11-conf_ynh_mysql +++ b/data/hooks/restore/11-conf_ynh_mysql @@ -1,5 +1,5 @@ backup_dir="$1/conf/ynh/mysql" -MYSQL_PKG="mariadb-server-10.1" +MYSQL_PKG="$(dpkg --list | sed -ne 's/^ii \(mariadb-server-[[:digit:].]\+\) .*$/\1/p')" . /usr/share/yunohost/helpers