Merge pull request #37 from autra/master

Fix typo in mail

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
 }

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"
 

scripts/remove

@@ -20,11 +20,6 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 ynh_remove_app_dependencies
 
-#=================================================
-# REMOVE BACKPORTS IF EXISTS
-#=================================================
-ynh_remove_backports
-
 #=================================================
 # REMOVE FILES
 #=================================================

scripts/restore

@@ -6,12 +6,7 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-if [ ! -e _common.sh ]; then
+source ../settings/scripts/_common.sh
-	# 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 /usr/share/yunohost/helpers
 
 #=================================================

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