From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 9 Dec 2022 12:09:07 +0000 (-0300)
Subject: Fix: use Tor package from trashman
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=fc76b9924021cf87598ee77bbf9de0c8609b1eec;p=trashman.git

Fix: use Tor package from trashman
---

diff --git a/share/trashman/tor-transproxy/unix/linux/debian/install b/share/trashman/tor-transproxy/unix/linux/debian/install
index 125dc2d..9508091 100755
--- a/share/trashman/tor-transproxy/unix/linux/debian/install
+++ b/share/trashman/tor-transproxy/unix/linux/debian/install
@@ -11,7 +11,9 @@ SHARE="$1"
 . $SHARE/trashman/debian    || exit 1
 
 # Dependencies
-trashman_apt_install tor iptables
+#trashman_apt_install tor iptables
+trashman_apt_install iptables
+trashman install tor
 
 # Firewall config
 cp $SHARE/tor-transproxy/unix/linux/debian/files/etc/network/if-pre-up.d/iptables /etc/network/if-pre-up.d/iptables
diff --git a/share/trashman/tor/unix/linux/debian/install b/share/trashman/tor/unix/linux/debian/install
index 71f1cb9..7a8055e 100755
--- a/share/trashman/tor/unix/linux/debian/install
+++ b/share/trashman/tor/unix/linux/debian/install
@@ -16,7 +16,8 @@ REQUIREMENTS="apt-transport-https wget gnupg"
 trashman_apt_install_packages $REQUIREMENTS
 
 # Additional parameters
-DISTRIBUTION="bullseye"
+#DISTRIBUTION="bullseye"
+DISTRIBUTION="`trashman_debian_major_version_name`"
 
 cat <<-EOF > /etc/apt/sources.list.d/tor.list
    deb     [signed-by=/usr/share/keyrings/tor-archive-keyring.gpg] https://deb.torproject.org/torproject.org $DISTRIBUTION main