diff options
3 files changed, 7 insertions, 7 deletions
diff --git a/share/trashman/tor-transproxy/unix/linux/debian/files/tbb/user.js b/share/trashman/tor-transproxy/unix/linux/debian/files/tbb/user.js index f8d9c0d..027e908 100644 --- a/share/trashman/tor-transproxy/unix/linux/debian/files/tbb/user.js +++ b/share/trashman/tor-transproxy/unix/linux/debian/files/tbb/user.js @@ -1,7 +1,7 @@ // Preferences for system-installed Tor Browser // Needs either // -// * Setting TOR_CONTROL_PASSWORD at ~/.local/share/torbrowser/tbb/x86_64/tor-browser_en-US/Browser/start-tor-browser +// * Setting TOR_CONTROL_PASSWORD at $TOR_BROWSER_PATH/start-tor-browser // * Passing TOR_CONTROL_PASSWORD to start-tor-browser via the command line // // See https://trac.torproject.org/projects/tor/wiki/TorBrowserBundleSAQ diff --git a/share/trashman/tor-transproxy/unix/linux/debian/install b/share/trashman/tor-transproxy/unix/linux/debian/install index 72cfff3..0a4b377 100755 --- a/share/trashman/tor-transproxy/unix/linux/debian/install +++ b/share/trashman/tor-transproxy/unix/linux/debian/install @@ -46,13 +46,13 @@ service tor restart # torbrowser-launcher from https://github.com/micahflee/torbrowser-launcher # (also at https://tracker.debian.org/torbrowser-launcher). # -#TB="$HOME/.local/share/torbrowser/tbb/$ARCH/tor-browser_en-US/Browser" -#TB="$HOME/.local/share/tor-browser/$ARCH/latest/Browser" -#if [ -e "$TB" ]; then +#TOR_BROWSER_PATH="$HOME/.local/share/torbrowser/tbb/$ARCH/tor-browser_en-US/Browser" +#TOR_BROWSER_PATH="$HOME/.local/share/tor-browser/$ARCH/latest/Browser" +#if [ -e "$TOR_BROWSER_PATH" ]; then # # Force about:config preferences -# cp $SHARE/tor-transproxy/unix/linux/debian/files/tbb/user.js $TB/TorBrowser/Data/Browser/profile.default/user.js +# cp $SHARE/tor-transproxy/unix/linux/debian/files/tbb/user.js $TOR_BROWSER_PATH/TorBrowser/Data/Browser/profile.default/user.js # # # Hard code control port password into the start-tor-browser script # sed -i -e "s/setControlPortPasswd \${TOR_CONTROL_PASSWD:='\"secret\"'/setControlPortPasswd \${TOR_CONTROL_PASSWD:='\"\"'}/" \ -# $TB/start-tor-browser +# $TOR_BROWSER_PATH/start-tor-browser #fi diff --git a/share/trashman/tor/unix/linux/debian/install b/share/trashman/tor/unix/linux/debian/install index 16efd9e..597551c 100755 --- a/share/trashman/tor/unix/linux/debian/install +++ b/share/trashman/tor/unix/linux/debian/install @@ -28,7 +28,7 @@ EOF rm -f /usr/share/keyrings/tor-archive-keyring.gpg rm -f /etc/apt/trusted.gpg.d/torproject.org.gpg -# Install temporary keyring +# Install keyring only if it does not already exists # Details at https://support.torproject.org/apt/tor-deb-repo/ #wget -O- https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | \ # gpg --dearmor | tee /usr/share/keyrings/deb.torproject.org-keyring.gpg > /dev/null |