Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-02 22:45:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

64-bit Tor Browser binaries have different filenames than 32-bit

Browse source
This commit is contained in:
Micah Lee 2022-06-19 15:57:10 -04:00
parent faf418217a
commit bf1bf5cd0d
2 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.circleci/config.yml
View file

@ -357,7 +357,7 @@ jobs:
if [[ -f "~/project/desktop/onionshare/resources/tor/obfs4proxy" ]]; then if [[ -f "~/project/desktop/onionshare/resources/tor/obfs4proxy" ]]; then
echo "obfs4proxy already built" echo "obfs4proxy already built"
else else
cd ~/projects/desktop cd ~/project/desktop
./scripts/build-pt-obfs4proxy.sh ./scripts/build-pt-obfs4proxy.sh
fi fi
- save_cache: - save_cache:
@ -373,7 +373,7 @@ jobs:
if [[ -f "~/project/desktop/onionshare/resources/tor/snowflake-client" ]]; then if [[ -f "~/project/desktop/onionshare/resources/tor/snowflake-client" ]]; then
echo "snowflake already built" echo "snowflake already built"
else else
cd ~/projects/desktop cd ~/project/desktop
./scripts/build-pt-snowflake.sh ./scripts/build-pt-snowflake.sh
fi fi
- save_cache: - save_cache:
@ -389,7 +389,7 @@ jobs:
if [[ -f "~/project/desktop/onionshare/resources/tor/meek-client" ]]; then if [[ -f "~/project/desktop/onionshare/resources/tor/meek-client" ]]; then
echo "meek already built" echo "meek already built"
else else
cd ~/projects/desktop cd ~/project/desktop
./scripts/build-pt-meek.sh ./scripts/build-pt-meek.sh
fi fi
- save_cache: - save_cache:

37
desktop/scripts/get-tor.py
View file

@ -45,10 +45,34 @@ def get_tor_windows(platform):
win_url = win32_url win_url = win32_url
win_filename = win32_filename win_filename = win32_filename
expected_win_sha256 = expected_win32_sha256 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": elif platform == "win64":
win_url = win64_url win_url = win64_url
win_filename = win64_filename win_filename = win64_filename
expected_win_sha256 = expected_win64_sha256 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: else:
click.echo("invalid platform") click.echo("invalid platform")
return return
@ -105,18 +129,7 @@ def get_tor_windows(platform):
if os.path.exists(dist_path): if os.path.exists(dist_path):
shutil.rmtree(dist_path) shutil.rmtree(dist_path)
os.makedirs(dist_path) os.makedirs(dist_path)
for filename in [ for filename in 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",
]:
shutil.copyfile( shutil.copyfile(
os.path.join(working_path, "Tor", filename), os.path.join(working_path, "Tor", filename),
os.path.join(dist_path, filename), os.path.join(dist_path, filename),