Merge pull request #586 from micahflee/wkd-requests

Download the Tor Browser signing key using requests instead of gnupg

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 3e5bb300e5b4b7e7611b029cd6bc19cb50079bef..6d7d55dcd182b2b19d39eac8eb287876f0424a15 100644 (file)
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Install dependencies
-      run: sudo apt-get install gettext python3 python3-packaging python3-gpg python3-pyqt5 python3-requests python3-socks
-    - name: Build torbrowser-launcher
-      run: python3 setup.py build
+    - name: Install system dependencies
+      run: sudo apt-get install gettext python3 libgpgme-dev
     - name: Install torbrowser-launcher
-      run: sudo python3 setup.py install
+      run: sudo pip3 install .
+    - name: Test torbrowser-launcher install
+      run: torbrowser-launcher -h

diff --git a/setup.py b/setup.py
index 67e126e20a8b3c9e66b700d02f66f396dfffaeec..4e06e60020b982973076cbd3f574dc9cecda38a4 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -118,4 +118,11 @@ Browser.
     packages=["torbrowser_launcher"],
     scripts=["torbrowser-launcher"],
     data_files=datafiles,
+    install_requires=[
+        'gpg',
+        'packaging',
+        'PyQt5',
+        'requests',
+        'PySocks',
+    ],
 )

diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
index 380b8f6bc38350000f771b4002859cb42c223e4d..cae725e4fdeca08727696000e26d037077580d71 100644 (file)
--- a/torbrowser_launcher/common.py
+++ b/torbrowser_launcher/common.py
@@ -64,6 +64,8 @@ class Common(object):
             self.mkdir(self.paths["dirs"][d])
         self.load_mirrors()
         self.load_settings()
+        # some settings require a path rebuild, like force_en-US
+        self.build_paths()
         self.mkdir(self.paths["download_dir"])
         self.mkdir(self.paths["tbb"]["dir"])
         self.init_gnupg()
@@ -168,6 +170,11 @@ class Common(object):
         )
         old_tbb_data = "{0}/.torbrowser".format(homedir)
 
+        if hasattr(self, "settings") and self.settings["force_en-US"]:
+            language = "en-US"
+        else:
+            language = self.language
+
         if tbb_version:
             # tarball filename
             if self.architecture == "x86_64":
@@ -175,10 +182,6 @@ class Common(object):
             else:
                 arch = "linux32"
 
-            if hasattr(self, "settings") and self.settings["force_en-US"]:
-                language = "en-US"
-            else:
-                language = self.language
             tarball_filename = (
                 "tor-browser-" + arch + "-" + tbb_version + "_" + language + ".tar.xz"
             )
@@ -232,19 +235,19 @@ class Common(object):
                     + "/tbb/"
                     + self.architecture
                     + "/tor-browser_"
-                    + self.language
+                    + language
                     + "/Browser/TorBrowser/Docs/ChangeLog.txt",
                     "dir": tbb_local + "/tbb/" + self.architecture,
                     "dir_tbb": tbb_local
                     + "/tbb/"
                     + self.architecture
                     + "/tor-browser_"
-                    + self.language,
+                    + language,
                     "start": tbb_local
                     + "/tbb/"
                     + self.architecture
                     + "/tor-browser_"
-                    + self.language
+                    + language
                     + "/start-tor-browser.desktop",
                 },
             }