From 6d18b6bfd4f6498cad1692059685ff902c0b4e7a Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 27 Feb 2020 17:58:45 +0100 Subject: [PATCH] [fix] Could delete a non system user --- manifest.json | 4 ++-- scripts/upgrade | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/manifest.json b/manifest.json index 17d572c..72df08b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Offer backup storage to a friend.", "fr": "Offrez un espace de stockage à un⋅e ami⋅e." }, - "version": "1.1.10~ynh2", + "version": "1.1.10~ynh3", "url": "https://borgbackup.readthedocs.io", "license": "BSD-3-Clause", "maintainer": { @@ -15,7 +15,7 @@ "url": "https://reflexlibre.net" }, "requirements": { - "yunohost": ">= 3.1" + "yunohost": ">= 3.6" }, "multi_instance": true, "services": [], diff --git a/scripts/upgrade b/scripts/upgrade index 5feee68..5ab24b3 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -34,9 +34,7 @@ ynh_clean_setup () { ynh_abort_if_errors # Replace backports with pip -if is_stretch; then - rm -f /etc/apt/sources.list.d/$app-stretch-backports.list +rm -f /etc/apt/sources.list.d/$app-stretch-backports.list - install_borg_with_pip -fi -rm -f /etc/yunohost/hooks.d/backup/17-data_home +install_borg_with_pip +ynh_secure_remove /etc/yunohost/hooks.d/backup/17-data_home