diff --git a/scripts/_common.sh b/scripts/_common.sh index 65380c9..21c15e5 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 } 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" 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 #================================================= 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 #================================================= 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