diff options
| author | Micah Lee <micah@micahflee.com> | 2022-06-19 15:57:10 -0400 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2022-06-19 15:57:10 -0400 |
| commit | e60c56d4574402d1647c4fcb47b260bd21dd250c (patch) | |
| tree | 54555bef33bf7b8c653cd8e0e85f191a4a56838e | |
| parent | 6a5de62ba5aba8e11a2b11813cacc2ab9ee88c35 (diff) | |
| download | onionshare-e60c56d4574402d1647c4fcb47b260bd21dd250c.tar.gz onionshare-e60c56d4574402d1647c4fcb47b260bd21dd250c.zip | |
64-bit Tor Browser binaries have different filenames than 32-bit
| -rw-r--r-- | .circleci/config.yml | 6 | ||||
| -rw-r--r-- | desktop/scripts/get-tor.py | 37 |
2 files changed, 28 insertions, 15 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 94f0761c..6e5fa62e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -357,7 +357,7 @@ jobs: if [[ -f "~/project/desktop/onionshare/resources/tor/obfs4proxy" ]]; then echo "obfs4proxy already built" else - cd ~/projects/desktop + cd ~/project/desktop ./scripts/build-pt-obfs4proxy.sh fi - save_cache: @@ -373,7 +373,7 @@ jobs: if [[ -f "~/project/desktop/onionshare/resources/tor/snowflake-client" ]]; then echo "snowflake already built" else - cd ~/projects/desktop + cd ~/project/desktop ./scripts/build-pt-snowflake.sh fi - save_cache: @@ -389,7 +389,7 @@ jobs: if [[ -f "~/project/desktop/onionshare/resources/tor/meek-client" ]]; then echo "meek already built" else - cd ~/projects/desktop + cd ~/project/desktop ./scripts/build-pt-meek.sh fi - save_cache: diff --git a/desktop/scripts/get-tor.py b/desktop/scripts/get-tor.py index 5df6918f..4ba53ce2 100644 --- a/desktop/scripts/get-tor.py +++ b/desktop/scripts/get-tor.py @@ -45,10 +45,34 @@ def get_tor_windows(platform): win_url = win32_url win_filename = win32_filename expected_win_sha256 = expected_win32_sha256 + bin_filenames = [ + "libcrypto-1_1.dll", + "libevent-2-1-7.dll", + "libevent_core-2-1-7.dll", + "libevent_extra-2-1-7.dll", + "libgcc_s_dw2-1.dll", + "libssl-1_1.dll", + "libssp-0.dll", + "libwinpthread-1.dll", + "tor.exe", + "zlib1.dll", + ] elif platform == "win64": win_url = win64_url win_filename = win64_filename expected_win_sha256 = expected_win64_sha256 + bin_filenames = [ + "libcrypto-1_1-x64.dll", + "libevent-2-1-7.dll", + "libevent_core-2-1-7.dll", + "libevent_extra-2-1-7.dll", + "libgcc_s_dw2-1.dll", + "libssl-1_1-x64.dll", + "libssp-0.dll", + "libwinpthread-1.dll", + "tor.exe", + "zlib1.dll", + ] else: click.echo("invalid platform") return @@ -105,18 +129,7 @@ def get_tor_windows(platform): if os.path.exists(dist_path): shutil.rmtree(dist_path) os.makedirs(dist_path) - for filename in [ - "libcrypto-1_1.dll", - "libevent-2-1-7.dll", - "libevent_core-2-1-7.dll", - "libevent_extra-2-1-7.dll", - "libgcc_s_dw2-1.dll", - "libssl-1_1.dll", - "libssp-0.dll", - "libwinpthread-1.dll", - "tor.exe", - "zlib1.dll", - ]: + for filename in bin_filenames: shutil.copyfile( os.path.join(working_path, "Tor", filename), os.path.join(dist_path, filename), |