From d6b6772677f8bb540f5ae7a292c9c5ba34e8a076 Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Sat, 21 Jan 2023 13:22:48 -0800
Subject: [PATCH 1/2] KASM-3934 disable update nag and modify new working
 pathing for binaries for version 12

---
 .../install/torbrowser/custom_startup.sh      |  2 +-
 .../install/torbrowser/install_torbrowser.sh  | 24 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/ubuntu/install/torbrowser/custom_startup.sh b/src/ubuntu/install/torbrowser/custom_startup.sh
index 0bde99d..cf14b06 100644
--- a/src/ubuntu/install/torbrowser/custom_startup.sh
+++ b/src/ubuntu/install/torbrowser/custom_startup.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -ex
-START_COMMAND="$HOME/tor-browser/tor-browser_en-US/Browser/start-tor-browser"
+START_COMMAND="$HOME/tor-browser/tor-browser/Browser/start-tor-browser"
 PGREP="firefox.real"
 MAXIMIZE=${MAXIMIZE:-"true"}
 export MAXIMIZE=$MAXIMIZE
diff --git a/src/ubuntu/install/torbrowser/install_torbrowser.sh b/src/ubuntu/install/torbrowser/install_torbrowser.sh
index 5f72bde..049f603 100644
--- a/src/ubuntu/install/torbrowser/install_torbrowser.sh
+++ b/src/ubuntu/install/torbrowser/install_torbrowser.sh
@@ -7,7 +7,7 @@ TOR_HOME=$HOME/tor-browser/
 mkdir -p $TOR_HOME
 if [ "$(arch)" == "aarch64" ]; then
   SF_VERSION=$(curl -sI https://sourceforge.net/projects/tor-browser-ports/files/latest/download | awk -F'(ports/|/tor)' '/location/ {print $3}')
-  FULL_TOR_URL="https://downloads.sourceforge.net/project/tor-browser-ports/${SF_VERSION}/tor-browser-linux-arm64-${SF_VERSION}_en-US.tar.xz"
+  FULL_TOR_URL="https://downloads.sourceforge.net/project/tor-browser-ports/${SF_VERSION}/tor-browser-linux-arm64-${SF_VERSION}.tar.xz"
 else
   TOR_URL=$(curl -q https://www.torproject.org/download/ | grep downloadLink | grep linux64 | sed 's/.*href="//g'  | cut -d '"' -f1 | head -1)
   FULL_TOR_URL="https://www.torproject.org/${TOR_URL}"
@@ -17,15 +17,19 @@ tar -xJf /tmp/torbrowser.tar.xz -C $TOR_HOME
 rm /tmp/torbrowser.tar.xz
 
 
-cp $TOR_HOME/tor-browser_en-US/start-tor-browser.desktop $TOR_HOME/tor-browser_en-US/start-tor-browser.desktop.bak
-cp $TOR_HOME/tor-browser_en-US/Browser/browser/chrome/icons/default/default128.png /usr/share/icons/tor.png
+cp $TOR_HOME/tor-browser/start-tor-browser.desktop $TOR_HOME/tor-browser/start-tor-browser.desktop.bak
+cp $TOR_HOME/tor-browser/Browser/browser/chrome/icons/default/default128.png /usr/share/icons/tor.png
 chown 1000:0 /usr/share/icons/tor.png
-sed -i 's/^Name=.*/Name=Tor Browser/g' $TOR_HOME/tor-browser_en-US/start-tor-browser.desktop
-sed -i 's/Icon=.*/Icon=\/usr\/share\/icons\/tor.png/g' $TOR_HOME/tor-browser_en-US/start-tor-browser.desktop
-sed -i 's/Exec=.*/Exec=sh -c \x27"$HOME\/tor-browser\/tor-browser_en-US\/Browser\/start-tor-browser" --detach || ([ !  -x "$HOME\/tor-browser\/tor-browser_en-US\/Browser\/start-tor-browser" ] \&\& "$(dirname "$*")"\/Browser\/start-tor-browser --detach)\x27 dummy %k/g'  $TOR_HOME/tor-browser_en-US/start-tor-browser.desktop
+sed -i 's/^Name=.*/Name=Tor Browser/g' $TOR_HOME/tor-browser/start-tor-browser.desktop
+sed -i 's/Icon=.*/Icon=\/usr\/share\/icons\/tor.png/g' $TOR_HOME/tor-browser/start-tor-browser.desktop
+sed -i 's/Exec=.*/Exec=sh -c \x27"$HOME\/tor-browser\/tor-browser\/Browser\/start-tor-browser" --detach || ([ !  -x "$HOME\/tor-browser\/tor-browser\/Browser\/start-tor-browser" ] \&\& "$(dirname "$*")"\/Browser\/start-tor-browser --detach)\x27 dummy %k/g'  $TOR_HOME/tor-browser/start-tor-browser.desktop
 
 
-cat >> $TOR_HOME/tor-browser_en-US/Browser/TorBrowser/Data/Browser/profile.default/prefs.js <<EOL
+cat >> $TOR_HOME/tor-browser/Browser/TorBrowser/Data/Browser/profile.default/prefs.js <<EOL
+user_pref("app.update.download.promptMaxAttempts", 0);
+user_pref("app.update.elevation.promptMaxAttempts", 0);
+user_pref("app.update.checkInstallTime", false);
+user_pref("app.update.background.interval", 315360000);
 user_pref("extensions.torlauncher.prompt_at_startup", false);
 user_pref("extensions.torlauncher.quickstart", true);
 user_pref("browser.download.lastDir", "/home/kasm-user/Downloads");
@@ -39,11 +43,11 @@ user_pref("torbrowser.settings.quickstart.enabled", true);
 EOL
 
 # Maintain backwards compatability with old image definitions that expect tor to be launched from /tmp
-mkdir -p /tmp/tor-browser_en-US/Browser/
-ln -s $TOR_HOME/tor-browser_en-US/start-tor-browser.desktop /tmp/tor-browser_en-US/Browser/start-tor-browser.desktop 
+mkdir -p /tmp/tor-browser/Browser/
+ln -s $TOR_HOME/tor-browser/start-tor-browser.desktop /tmp/tor-browser/Browser/start-tor-browser.desktop 
 
 chown -R 1000:0 $TOR_HOME/
 
 
-cp $TOR_HOME/tor-browser_en-US/start-tor-browser.desktop $HOME/Desktop/
+cp $TOR_HOME/tor-browser/start-tor-browser.desktop $HOME/Desktop/
 chown 1000:0  $HOME/Desktop/start-tor-browser.desktop

From 3e8eb23952c4ecbb2f913f798608ee7b56ddda13 Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Sat, 21 Jan 2023 13:34:01 -0800
Subject: [PATCH 2/2] KASM-3934 bad URL for arm64

---
 src/ubuntu/install/torbrowser/install_torbrowser.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ubuntu/install/torbrowser/install_torbrowser.sh b/src/ubuntu/install/torbrowser/install_torbrowser.sh
index 049f603..7655009 100644
--- a/src/ubuntu/install/torbrowser/install_torbrowser.sh
+++ b/src/ubuntu/install/torbrowser/install_torbrowser.sh
@@ -7,7 +7,7 @@ TOR_HOME=$HOME/tor-browser/
 mkdir -p $TOR_HOME
 if [ "$(arch)" == "aarch64" ]; then
   SF_VERSION=$(curl -sI https://sourceforge.net/projects/tor-browser-ports/files/latest/download | awk -F'(ports/|/tor)' '/location/ {print $3}')
-  FULL_TOR_URL="https://downloads.sourceforge.net/project/tor-browser-ports/${SF_VERSION}/tor-browser-linux-arm64-${SF_VERSION}.tar.xz"
+  FULL_TOR_URL="https://downloads.sourceforge.net/project/tor-browser-ports/${SF_VERSION}/tor-browser-linux-arm64-${SF_VERSION}_ALL.tar.xz"
 else
   TOR_URL=$(curl -q https://www.torproject.org/download/ | grep downloadLink | grep linux64 | sed 's/.*href="//g'  | cut -d '"' -f1 | head -1)
   FULL_TOR_URL="https://www.torproject.org/${TOR_URL}"