CHANGELOG.md

 # Tor Browser Launcher Changelog
 
+## 0.3.1
+
+* Ship with latest version of the Tor Browser Developers OpenPGP public key
+* Fix bug where TBL window stays open after Tor Browser is launched
+
 ## 0.3.0
 
 * Switched from python2 to python3

debian/changelog

+torbrowser-launcher (0.3.1-1~exp1) experimental; urgency=medium
+
+  * New upstream release 0.3.1
+    - Ship with latest version of the Tor Browser Developers
+      OpenPGP public key
+    - Fix bug where TBL window stays open after Tor Browser
+      is launched
+  * debian/patches:
+    - Remove 0004 patch which is already merged upstream.
+
+ -- Roger Shimizu <rosh@debian.org>  Sun, 28 Oct 2018 02:27:31 +0900
+
 torbrowser-launcher (0.3.0-1~exp2) experimental; urgency=medium
 
   * debian/copyright:

debian/patches/series

 0001-Remove-apparmor-local-path-from-setup.py.patch
 0002-show-gui-only-if-tbb-not-installed.patch
 0003-remove-double-common-assignment.patch
-0004-Update-Tor-Browser-Developers-public-key.patch

ppa_release.sh

@@ -16,7 +16,7 @@ VERSION=`cat share/torbrowser-launcher/version`
 
 # Make a source pacakge
 rm -rf deb_dist
-python setup.py --command-packages=stdeb.command sdist_dsc
+python3 setup.py --command-packages=stdeb.command sdist_dsc
 
 # Sign it
 cd deb_dist/torbrowser-launcher-$VERSION

share/torbrowser-launcher/version

-0.3.0
+0.3.1

stdeb.cfg

 [DEFAULT]
 Package3: torbrowser-launcher
 Depends3: python3-pyqt5, python3-gpg, python3-requests, python3-socks, gnupg2
-Build-Depends: dh-python
+Build-Depends: dh-python, python3-pyqt5, python3-gpg, python3-requests, python3-socks, gnupg2
 Recommends: tor
-Suite: artful
+Suite: bionic

torbrowser_launcher/common.py

@@ -37,7 +37,7 @@ import re
 import gettext
 import gpg
 
-SHARE = os.getenv('TBL_SHARE', sys.prefix+'/share/torbrowser-launcher')
+SHARE = os.getenv('TBL_SHARE', sys.prefix + '/share') + '/torbrowser-launcher'
 
 gettext.install('torbrowser-launcher')
 

torbrowser_launcher/launcher.py

@@ -27,6 +27,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 """
 
 import os
+import sys
 import subprocess
 import time
 import tarfile
@@ -101,10 +102,10 @@ class Launcher(QtWidgets.QMainWindow):
 
         else:
             # Tor Browser is already installed, so run
-            self.run(False)
-            self.launch_gui = False
+            launch_message = "Launching Tor Browser."
+            print(launch_message)
+            self.set_state('task', launch_message, ['run'])
 
-        if self.launch_gui:
         # Build the rest of the UI
 
         # Set up the window
@@ -421,7 +422,7 @@ class Launcher(QtWidgets.QMainWindow):
 
         return False
 
-    def run(self, run_next_task=True):
+    def run(self):
         # Don't run if it isn't at least the minimum version
         if not self.check_min_version():
             message = _("The version of Tor Browser you have installed is earlier than it should be, which could be a "
@@ -431,14 +432,9 @@ class Launcher(QtWidgets.QMainWindow):
             Alert(self.common, message)
             return
 
-        # Hide the TBL window (#151)
-        self.hide()
-
         # Run Tor Browser
         subprocess.call([self.common.paths['tbb']['start']], cwd=self.common.paths['tbb']['dir_tbb'])
-
-        if run_next_task:
-            self.run_task()
+        sys.exit(0)
 
     # Start over and download TBB again
     def start_over(self):