From 7ec56455cd2b6904d09c44510cf12b01649a26a5 Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Sat, 1 Oct 2022 20:51:03 -0400
Subject: [PATCH] remove obsolete/redundant Unix scripts

---
 build.sh                                   |  1 +
 src/unix/desktop/i2pbrowser-debian.desktop |  9 ----
 src/unix/desktop/i2pbrowser.desktop        |  9 ----
 src/unix/desktop/i2pconfig-debian.desktop  |  9 ----
 src/unix/desktop/i2pconfig.desktop         |  9 ----
 src/unix/i2p-config-service-setup.sh       | 21 --------
 src/unix/i2pbrowser.sh                     | 44 ----------------
 src/unix/i2pbrowserdebianrc                | 17 ------
 src/unix/i2pbrowserrc                      |  8 ---
 src/unix/i2pconfig.sh                      | 60 ----------------------
 src/unix/torbrowser.sh                     | 21 ++++++++
 11 files changed, 22 insertions(+), 186 deletions(-)
 delete mode 100644 src/unix/desktop/i2pbrowser-debian.desktop
 delete mode 100644 src/unix/desktop/i2pbrowser.desktop
 delete mode 100644 src/unix/desktop/i2pconfig-debian.desktop
 delete mode 100644 src/unix/desktop/i2pconfig.desktop
 delete mode 100755 src/unix/i2p-config-service-setup.sh
 delete mode 100755 src/unix/i2pbrowser.sh
 delete mode 100644 src/unix/i2pbrowserdebianrc
 delete mode 100644 src/unix/i2pbrowserrc
 delete mode 100755 src/unix/i2pconfig.sh
 create mode 100644 src/unix/torbrowser.sh

diff --git a/build.sh b/build.sh
index 7c92c0c..b801d2f 100755
--- a/build.sh
+++ b/build.sh
@@ -38,6 +38,7 @@ make src/I2P/config
   $JPACKAGE_OPTS \
   --resource-dir build \
   --app-content src/I2P/config \
+  --app-content src/unix/torbrowser.sh \
   --app-content src/icons/windowsUIToopie2.png \
   --app-content src/icons/ui2pbrowser_icon.ico \
   --icon src/icons/windowsUIToopie2.png \
diff --git a/src/unix/desktop/i2pbrowser-debian.desktop b/src/unix/desktop/i2pbrowser-debian.desktop
deleted file mode 100644
index 23b3eba..0000000
--- a/src/unix/desktop/i2pbrowser-debian.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=/usr/bin/i2pbrowser.sh
-Name=I2P Browser
-Categories=Network;WebBrowser;
-Icon=/var/lib/i2pbrowser/icons/ui2pbrowser_icon.ico
\ No newline at end of file
diff --git a/src/unix/desktop/i2pbrowser.desktop b/src/unix/desktop/i2pbrowser.desktop
deleted file mode 100644
index 24c7616..0000000
--- a/src/unix/desktop/i2pbrowser.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=/usr/local/bin/i2pbrowser
-Name=I2P Browser
-Categories=Network;WebBrowser;
-Icon=/var/lib/i2pbrowser/icons/ui2pbrowser_icon.ico
\ No newline at end of file
diff --git a/src/unix/desktop/i2pconfig-debian.desktop b/src/unix/desktop/i2pconfig-debian.desktop
deleted file mode 100644
index 3c9b853..0000000
--- a/src/unix/desktop/i2pconfig-debian.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=/usr/bin/i2pconfig.sh
-Name=I2P Configuration
-Categories=Network;WebBrowser;
-Icon=/var/lib/i2pbrowser/icons/ui2pbrowser_icon.ico
\ No newline at end of file
diff --git a/src/unix/desktop/i2pconfig.desktop b/src/unix/desktop/i2pconfig.desktop
deleted file mode 100644
index db8d3b8..0000000
--- a/src/unix/desktop/i2pconfig.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=/usr/local/bin/i2pconfig
-Name=I2P Configuration
-Categories=Network;WebBrowser;
-Icon=/var/lib/i2pbrowser/icons/ui2pbrowser_icon.ico
\ No newline at end of file
diff --git a/src/unix/i2p-config-service-setup.sh b/src/unix/i2p-config-service-setup.sh
deleted file mode 100755
index 1597f88..0000000
--- a/src/unix/i2p-config-service-setup.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /usr/bin/env sh
-
-# Works for Debian service installs. Sets up minified, custom profile for configuring I2P console.
-
-if grep '^i2psvc:' /etc/passwd; then
-  I2P_HOME=$(grep '^i2psvc:' /etc/passwd | sed 's|i2psvc:x:||g' | sed 's|:/usr/sbin/nologin||g' | tr -d ':1234567890' | sed 's|ip|i2p|g')
-  ROUTER_CONFIG=$(sudo -u i2psvc ls $I2P_HOME/i2p-config/router.config)
-fi
-
-installer(){
-
-  if [ $(sudo -u i2psvc ls $I2P_HOME/i2p-config/router.config) ]; then
-    echo $I2P_HOME $ROUTER_CONFIG $0
-      if ! sudo -u i2psvc grep -R 'routerconsole.browser' "$I2P_HOME/i2p-config/router.config" ; then
-        echo "routerconsole.browser=/usr/local/bin/i2pconfig" | sudo tee -a "$I2P_HOME/i2p-config/router.config"
-      fi
-  fi
-}
-
-
-installer
diff --git a/src/unix/i2pbrowser.sh b/src/unix/i2pbrowser.sh
deleted file mode 100755
index 5bb33f6..0000000
--- a/src/unix/i2pbrowser.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /usr/bin/env sh
-
-if [ -f "/etc/i2pbrowser/i2pbrowserrc" ]; then
-  . /etc/i2pbrowser/i2pbrowserrc
-fi
-
-if [ ! -z $I2PROUTER ]; then
-  "$I2PROUTER" start
-fi
-
-if [ -z $BROWSING_PROFILE ]; then
-  BROWSING_PROFILE="."
-fi
-
-if [ ! -d "$BROWSING_PROFILE" ]; then
-  mkdir -p "$BROWSING_PROFILE" 
-  cp -vr /var/lib/i2pbrowser/profile/* "$BROWSING_PROFILE" 
-fi
-
-if [ ! -f "$BROWSING_PROFILE/user.js" ]; then
-  echo "user.js not present in $BROWSING_PROFILE, this is not a Firefox profile"
-  exit 1
-fi
-
-if [ -z $FIREFOX ]; then
-  if [ -f "firefox/firefox" ]; then
-    FIREFOX="./firefox/firefox"
-  fi
-  FIREFOX=$(which firefox-esr)
-  if [ -z $FIREFOX ]; then
-    FIREFOX=$(which firefox)
-  fi
-fi
-
-if [ -z $FIREFOX ]; then
-  echo "Firefox does not appear to be in your \$PATH."
-  echo "Please install Firefox via a package manager, or"
-  echo "or set the FIREFOX variable in your shell to the"
-  echo "location of a Firefox executable."
-  exit 1
-fi
-
-echo $FIREFOX --profile "$BROWSING_PROFILE" $@
-$FIREFOX --profile "$BROWSING_PROFILE" $@
\ No newline at end of file
diff --git a/src/unix/i2pbrowserdebianrc b/src/unix/i2pbrowserdebianrc
deleted file mode 100644
index d7cb161..0000000
--- a/src/unix/i2pbrowserdebianrc
+++ /dev/null
@@ -1,17 +0,0 @@
-
-I2PROUTER=$(which i2prouter)
-
-if [ -z $I2PROUTER ]; then
-  I2PROUTER=/usr/sbin/i2prouter
-fi
-
-if [ ! -f $I2PROUTER ]; then
-  I2PROUTER="$HOME/i2p/i2prouter"
-fi
-
-if [ ! -f $I2PROUTER ]; then
-  I2PROUTER=""
-fi
-
-wget -q -O - "http://localhost:7657" >/dev/null  && I2PROUTER=""
-echo "$I2PROUTER"
\ No newline at end of file
diff --git a/src/unix/i2pbrowserrc b/src/unix/i2pbrowserrc
deleted file mode 100644
index 5732c59..0000000
--- a/src/unix/i2pbrowserrc
+++ /dev/null
@@ -1,8 +0,0 @@
-
-if [ -f /etc/i2pbrowser/i2pbrowserdebianrc ]; then
-  . /etc/i2pbrowser/i2pbrowserdebianrc
-fi
-
-CONFIGURING_PROFILE=$HOME/i2p/firefox/webapps
-BROWSING_PROFILE=$HOME/i2p/firefox/browsing
-ROUTER_CONSOLE="127.0.0.1:7657"
diff --git a/src/unix/i2pconfig.sh b/src/unix/i2pconfig.sh
deleted file mode 100755
index 4e19bae..0000000
--- a/src/unix/i2pconfig.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /usr/bin/env sh
-
-if [ -f "/etc/i2pbrowser/i2pbrowserrc" ]; then
-  . /etc/i2pbrowser/i2pbrowserrc
-fi
-
-if [ ! -z $I2PROUTER ]; then
-  "$I2PROUTER" start
-fi
-
-if [ -f "$HOME/.i2p/router.config" ]; then
-  if [ "$0" = "/usr/local/bin/i2pconfig" ]; then
-    if ! grep -R 'routerconsole.browser' "$HOME/.i2p/router.config" ; then
-      echo "routerconsole.browser=$0" | tee -a "$HOME/.i2p/router.config"
-    fi
-  fi
-fi
-
-if [ -z $CONFIGURING_PROFILE ]; then
-  CONFIGURING_PROFILE="."
-fi
-
-if [ -z $ROUTER_CONSOLE ]; then
-  ROUTER_CONSOLE="$1"
-  if [ -z $1 ]; then
-    ROUTER_CONSOLE="http://127.0.0.1:7657"
-  fi
-fi
-
-if [ ! -d "$CONFIGURING_PROFILE" ]; then
-  mkdir -p "$CONFIGURING_PROFILE" 
-  cp -vr /var/lib/i2pbrowser/app-profile/* "$CONFIGURING_PROFILE" 
-fi
-
-if [ ! -f "$CONFIGURING_PROFILE/user.js" ]; then
-  echo "user.js not present in $CONFIGURING_PROFILE, this is not a Firefox profile"
-  exit 1
-fi
-
-if [ -z $FIREFOX ]; then
-  if [ -f "firefox/firefox" ]; then
-    FIREFOX="./firefox/firefox"
-  fi
-  FIREFOX=$(which firefox-esr)
-  if [ -z $FIREFOX ]; then
-    FIREFOX=$(which firefox)
-  fi
-fi
-
-if [ -z $FIREFOX ]; then
-  echo "Firefox does not appear to be in your \$PATH."
-  echo "Please install Firefox via a package manager, or"
-  echo "or set the FIREFOX variable in your shell to the"
-  echo "location of a Firefox executable."
-  exit 1
-fi
-
-echo $FIREFOX --profile "$CONFIGURING_PROFILE" "$ROUTER_CONSOLE" $@
-
-$FIREFOX --profile "$CONFIGURING_PROFILE" "$ROUTER_CONSOLE" $@
diff --git a/src/unix/torbrowser.sh b/src/unix/torbrowser.sh
new file mode 100644
index 0000000..914744b
--- /dev/null
+++ b/src/unix/torbrowser.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
+locale="en-US" # mention your locale. default = en-US
+if [ -d /etc/default/locale ]; then
+    . /etc/default/locale
+    locale=$(echo "${LANG}" | cut -d . -f1)
+fi
+
+if [ ! -f ./tor.keyring ]; then
+    gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser@torproject.org
+    gpg --output ./tor.keyring --export torbrowser@torproject.org
+fi
+
+if [ ! -f "tor-browser-linux64-"$version"_"$locale".tar.xz" ]; then
+    wget -cv "https://www.torproject.org/dist/torbrowser/"$version"/tor-browser-linux64-"$version"_"$locale".tar.xz" 
+    wget -cv "https://www.torproject.org/dist/torbrowser/"$version"/tor-browser-linux64-"$version"_"$locale".tar.xz.asc"
+fi
+
+gpgv --keyring ./tor.keyring "tor-browser-linux64-"$version"_"$locale".tar.xz.asc" "tor-browser-linux64-"$version"_"$locale".tar.xz"
+
+tar xvJf "tor-browser-linux64-"$version"_"$locale".tar.xz"