From 4acf009b400d22768a1f1460aee835b84b95f042 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 25 Mar 2019 17:36:33 +0100 Subject: [PATCH] remove ynh_add_secure_repos__2 --- scripts/install | 6 ++---- scripts/remove | 3 +-- scripts/restore | 7 +++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/scripts/install b/scripts/install index d86adcf..60d6a73 100755 --- a/scripts/install +++ b/scripts/install @@ -8,7 +8,6 @@ source _common.sh source ynh_systemd_action -source ynh_add_secure_repos__2 source /usr/share/yunohost/helpers #================================================= @@ -94,11 +93,10 @@ ynh_print_info "Adding Erlang repository..." wget https://packages.erlang-solutions.com/debian/erlang_solutions.asc apt-key add erlang_solutions.asc rm erlang_solutions.asc - if [ "$(lsb_release --codename --short)" == "jessie" ]; then - ynh_install_extra_repo --repo="deb http://packages.erlang-solutions.com/debian jessie contrib" + echo "deb http://packages.erlang-solutions.com/debian jessie contrib" | tee /etc/apt/sources.list.d/$app.list elif [ "$(lsb_release --codename --short)" == "stretch" ]; then - ynh_install_extra_repo --repo="deb http://packages.erlang-solutions.com/debian stretch contrib" + echo "deb http://packages.erlang-solutions.com/debian stretch contrib" | tee /etc/apt/sources.list.d/$app.list fi ynh_package_update diff --git a/scripts/remove b/scripts/remove index 2de13fc..4089ddd 100755 --- a/scripts/remove +++ b/scripts/remove @@ -8,7 +8,6 @@ source _common.sh source ynh_systemd_action -source ynh_add_secure_repos__2 source /usr/share/yunohost/helpers #================================================= @@ -75,7 +74,7 @@ ynh_remove_app_dependencies #================================================= ynh_print_info "Removing erlang repository..." -ynh_remove_extra_repo +ynh_secure_remove "/etc/apt/sources.list.d/${app}.list" apt-key del A14F4FCA #================================================= diff --git a/scripts/restore b/scripts/restore index 726bbc3..0b9ba3e 100755 --- a/scripts/restore +++ b/scripts/restore @@ -8,7 +8,6 @@ source ../settings/scripts/_common.sh source ../settings/scripts/ynh_systemd_action -source ../settings/scripts/ynh_add_secure_repos__2 source /usr/share/yunohost/helpers #================================================= @@ -91,12 +90,12 @@ ynh_print_info "Adding Erlang repository..." wget https://packages.erlang-solutions.com/debian/erlang_solutions.asc apt-key add erlang_solutions.asc rm erlang_solutions.asc - if [ "$(lsb_release --codename --short)" == "jessie" ]; then - ynh_install_extra_repo --repo="deb http://packages.erlang-solutions.com/debian jessie contrib" + echo "deb http://packages.erlang-solutions.com/debian jessie contrib" | tee /etc/apt/sources.list.d/$app.list elif [ "$(lsb_release --codename --short)" == "stretch" ]; then - ynh_install_extra_repo --repo="deb http://packages.erlang-solutions.com/debian stretch contrib" + echo "deb http://packages.erlang-solutions.com/debian stretch contrib" | tee /etc/apt/sources.list.d/$app.list fi +ynh_package_update #================================================= # REINSTALL DEPENDENCIES