From 72b7d24423635bc43d0f87e5bb1f1ebc010fb5f5 Mon Sep 17 00:00:00 2001
From: Denis Laxalde <denis@laxalde.org>
Date: Mon, 13 May 2024 10:21:41 +0200
Subject: [PATCH 1/2] Use Browser/start-tor-browser instead of .desktop file

This should have no functional consequence but will help with allowing
to start the browser with non-default options.
---
 torbrowser_launcher/common.py   | 2 +-
 torbrowser_launcher/launcher.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
index e2aa39f..8d1e2f0 100644
--- a/torbrowser_launcher/common.py
+++ b/torbrowser_launcher/common.py
@@ -155,7 +155,7 @@ def build_paths(self, tbb_version=None):
                     "start": tbb_local
                     + "/tbb/"
                     + self.architecture
-                    + "/tor-browser/start-tor-browser.desktop",
+                    + "/tor-browser/Browser/start-tor-browser",
                 },
             }
 
diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
index d339366..8161a68 100644
--- a/torbrowser_launcher/launcher.py
+++ b/torbrowser_launcher/launcher.py
@@ -478,7 +478,8 @@ def run(self):
 
         # Run Tor Browser
         subprocess.call(
-            [self.common.paths["tbb"]["start"]], cwd=self.common.paths["tbb"]["dir_tbb"]
+            [self.common.paths["tbb"]["start"], "--detach"],
+            cwd=self.common.paths["tbb"]["dir_tbb"],
         )
         sys.exit(0)
 

From ba1bfc142eb66dde77091d1a30aa2dadb8e0f1a2 Mon Sep 17 00:00:00 2001
From: Denis Laxalde <denis@laxalde.org>
Date: Mon, 13 May 2024 10:21:25 +0200
Subject: [PATCH 2/2] Add a --debug option

Add a --debug option which run "start-tor-browser" with --verbose option
and without --detach. This makes the program run in the foreground and
log underlying output to console.

Closes #435.
---
 torbrowser_launcher/__init__.py | 8 +++++++-
 torbrowser_launcher/launcher.py | 5 +++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/torbrowser_launcher/__init__.py b/torbrowser_launcher/__init__.py
index 4eef7fe..e332eea 100644
--- a/torbrowser_launcher/__init__.py
+++ b/torbrowser_launcher/__init__.py
@@ -59,6 +59,12 @@ def main():
         dest="settings",
         help="Open Tor Browser Launcher settings",
     )
+    parser.add_argument(
+        "--debug",
+        action="store_true",
+        default=False,
+        help="Launch browser in debug mode (foreground, log to terminal)",
+    )
     parser.add_argument("url", nargs="*", help="URL to load")
     args = parser.parse_args()
 
@@ -89,7 +95,7 @@ def main():
         gui = Settings(common, app)
     else:
         # Launcher mode
-        gui = Launcher(common, app, url_list)
+        gui = Launcher(common, app, url_list, debug=args.debug)
 
     # Center the window
     desktop = app.desktop()
diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
index 8161a68..63a615a 100644
--- a/torbrowser_launcher/launcher.py
+++ b/torbrowser_launcher/launcher.py
@@ -64,12 +64,13 @@ class Launcher(QtWidgets.QMainWindow):
     Launcher window.
     """
 
-    def __init__(self, common, app, url_list):
+    def __init__(self, common, app, url_list, debug=False):
         super(Launcher, self).__init__()
         self.common = common
         self.app = app
 
         self.url_list = url_list
+        self.debug = debug
         self.force_redownload = False
 
         # This is the current version of Tor Browser, which should get updated with every release
@@ -478,7 +479,7 @@ def run(self):
 
         # Run Tor Browser
         subprocess.call(
-            [self.common.paths["tbb"]["start"], "--detach"],
+            [self.common.paths["tbb"]["start"], "--verbose" if self.debug else "--detach"],
             cwd=self.common.paths["tbb"]["dir_tbb"],
         )
         sys.exit(0)