From b21619d8cca5a2db022a4bd3f4344597eee9d20c Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Fri, 31 Jul 2020 10:57:52 +0200 Subject: [PATCH 1/4] [fix] Upgrade to buster --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3401b3b..6032514 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,9 +57,9 @@ if grep "borg.timer" /etc/yunohost/services.yml > /dev/null ; then fi # Replace backports with pip -if is_stretch; then +if is_buster; then rm -f /etc/apt/sources.list.d/$app-stretch-backports.list - + ynh_secure_remove /opt/borg-env install_borg_with_pip fi From 30d3de31c167c7962eccc93127d11b6e7203b7a7 Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Fri, 31 Jul 2020 10:59:17 +0200 Subject: [PATCH 2/4] [fix] Add is_buster function --- scripts/_common.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/_common.sh b/scripts/_common.sh index 21c15e5..f8e32bd 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -206,6 +206,15 @@ ynh_debian_release () { lsb_release --codename --short } +is_buster () { + if [ "$(ynh_debian_release)" == "buster" ] + then + return 0 + else + return 1 + fi +} + is_stretch () { if [ "$(ynh_debian_release)" == "stretch" ] then From e7c32a5d5607e603773b4aa4b7ad25e05a6afe9c Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Fri, 31 Jul 2020 11:01:29 +0200 Subject: [PATCH 3/4] [fix] Reinstall 1 time only --- scripts/upgrade | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 6032514..139e4ee 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -58,9 +58,13 @@ fi # Replace backports with pip if is_buster; then + if [ ! -f /opt/borg-env/buster ] ; then rm -f /etc/apt/sources.list.d/$app-stretch-backports.list ynh_secure_remove /opt/borg-env install_borg_with_pip + touch /opt/borg-env/buster + fi + fi #================================================= From b3560b7b22ffd84a0cfd2b480859e5ecb0bbd62a Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Fri, 31 Jul 2020 11:02:06 +0200 Subject: [PATCH 4/4] [fix] Upgrade version number --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 7ee5f85..8517205 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Backup your server on a host server using Borg.", "fr": "Sauvegardez votre serveur sur un serveur distant avec Borg." }, - "version": "1.1.10~ynh5", + "version": "1.1.10~ynh6", "url": "https://borgbackup.readthedocs.io", "license": "BSD-3-Clause", "maintainer": {