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/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..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,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"], "--verbose" if self.debug else "--detach"], + cwd=self.common.paths["tbb"]["dir_tbb"], ) sys.exit(0)