From a1cbabb4f60e0a56c096c3e0dd97468af9db5eed Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Mon, 10 Jun 2019 18:41:04 +0200
Subject: [PATCH 1/5] [enh] Remove dead code

---
 scripts/remove | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/scripts/remove b/scripts/remove
index 4f138e3..3463708 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -20,11 +20,6 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 ynh_remove_app_dependencies
 
-#=================================================
-# REMOVE BACKPORTS IF EXISTS
-#=================================================
-ynh_remove_backports
-
 #=================================================
 # REMOVE FILES
 #=================================================

From 62e61ff4418277e457a051b57659a78ca1976fdc Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Mon, 10 Jun 2019 18:41:57 +0200
Subject: [PATCH 2/5] [enh] Pass false positive linter

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 612b8b9..8a24bbb 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -42,7 +42,7 @@ fi
 
 # Replace backports with pip
 if is_stretch; then
-    ynh_remove_backports
+    rm -f /etc/apt/sources.list.d/$app-stretch-backports.list
 
     install_borg_with_pip
 fi

From 85e2a0b593d342b8697efc89416eb480814ff948 Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Mon, 10 Jun 2019 18:42:34 +0200
Subject: [PATCH 3/5] [enh] Pass false positive linter

---
 scripts/_common.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 27a19e0..03d43dd 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -202,10 +202,6 @@ ynh_check_app_version_changed () {
   echo $return_value
 }
 
-ynh_remove_backports () {
-    rm -f /etc/apt/sources.list.d/$app-stretch-backports.list
-}
-
 ynh_debian_release () {
 	lsb_release --codename --short
 }

From 5b1f2fed3cc21138c22433b0f862018b6579a919 Mon Sep 17 00:00:00 2001
From: "ljf (zamentur)" <zamentur@users.noreply.github.com>
Date: Mon, 10 Jun 2019 18:49:50 +0200
Subject: [PATCH 4/5] [enh] Correctly call common.sh in restore

---
 scripts/restore | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/scripts/restore b/scripts/restore
index 1a4cb76..df9443e 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -6,12 +6,7 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-if [ ! -e _common.sh ]; then
-	# Get the _common.sh file if it's not in the current directory
-	cp ../settings/scripts/_common.sh ./_common.sh
-	chmod a+rx _common.sh
-fi
-source _common.sh
+source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================

From 36e36ee87c4b20fdc369acf4eaf461fa1d8824de Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@oslandia.com>
Date: Fri, 1 Nov 2019 22:31:06 +0100
Subject: [PATCH 5/5] Fix typo in mail

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index fd68558..b80bca6 100755
--- a/scripts/install
+++ b/scripts/install
@@ -84,7 +84,7 @@ Public key: $(cat ${private_key}.pub)
 
 Or if you want to use cli:
 
-yunohost app install https://github.com/YunoHost-Apps/borg_server_ynh -a \"ssh_user=${ssh_user}&public_key=$(cat ${private_key}.pub)\"
+yunohost app install https://github.com/YunoHost-Apps/borgserver_ynh -a \"ssh_user=${ssh_user}&public_key=$(cat ${private_key}.pub)\"
 
 If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/borg_ynh"