From efea5d98b310c105810f1cd84337d5a7a02500b7 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Wed, 19 Apr 2023 21:15:06 +0200 Subject: [PATCH] adding tor repos to always get the latest versions --- scripts/_common.sh | 3 ++- scripts/install | 4 +++- scripts/restore | 4 +++- scripts/upgrade | 4 +++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index fe89279..ee93074 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,8 @@ #================================================= # dependencies used by the app -pkg_dependencies="tor obfs4proxy" +pkg_dependencies="apt-transport-https obfs4proxy" +pkg_dependencies_extra="tor tor-geoipdb deb.torproject.org-keyring" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 7b84ddc..d4c8bc6 100755 --- a/scripts/install +++ b/scripts/install @@ -60,7 +60,9 @@ ynh_exec_warn_less yunohost firewall allow Both $obfs4_port #================================================= ynh_script_progression --message="Installing dependencies..." --weight=10 -ynh_install_app_dependencies $pkg_dependencies +ynh_install_app_dependencies "$pkg_dependencies" + +ynh_install_extra_app_dependencies --repo="https://deb.torproject.org/torproject.org" --package="$pkg_dependencies_extra" --key="https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc" #================================================= # ADD A CONFIGURATION diff --git a/scripts/restore b/scripts/restore index 1990054..d4b9938 100755 --- a/scripts/restore +++ b/scripts/restore @@ -36,7 +36,9 @@ obfs4_port=$(ynh_app_setting_get --app=$app --key=obfs4_port) ynh_script_progression --message="Reinstalling dependencies..." --weight=10 # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +ynh_install_app_dependencies "$pkg_dependencies" + +ynh_install_extra_app_dependencies --repo="https://deb.torproject.org/torproject.org" --package="$pkg_dependencies_extra" --key="https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc" #================================================= # RESTORE VARIOUS FILES diff --git a/scripts/upgrade b/scripts/upgrade index 144be9c..d26f944 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -56,7 +56,9 @@ ynh_systemd_action --service_name=tor --action="stop" --log_path="systemd" #================================================= ynh_script_progression --message="Upgrading dependencies..." --weight=10 -ynh_install_app_dependencies $pkg_dependencies +ynh_install_app_dependencies "$pkg_dependencies" + +ynh_install_extra_app_dependencies --repo="https://deb.torproject.org/torproject.org" --package="$pkg_dependencies_extra" --key="https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc" #================================================= # UPDATE A CONFIG FILE