Skip to content
Snippets Groups Projects
Verified Commit 6da7839e authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern:
Browse files

Bug 40695: Do not ship the macOS tor shim anymore

We moved the requested operations to Tor Browser side.
parent c027f7cb
No related branches found
No related tags found
1 merge request!620Bug 40695: Do not ship the macOS tor shim anymore
#!/bin/sh
# Compiled Python modules require a compatible Python, which means 32-bit 2.6.
export VERSIONER_PYTHON_VERSION=2.6
export DYLD_LIBRARY_PATH=.:$DYLD_LIBRARY_PATH
# Set the current working directory to the directory containing this executable,
# so that pluggable transport executables can be given with relative paths. This
# works around a change in OS X 10.9, where the current working directory is
# otherwise set to "/" when an application bundle is started from Finder.
# https://trac.torproject.org/projects/tor/ticket/10030
cd "$(dirname "$0")"
if [ ! -f tor.real -a -d ../../../MacOS/Tor ]; then
# On newer releases of Tor Browser, tor.real is in Contents/MacOS/Tor/.
cd ../../../MacOS/Tor
fi
exec ./tor.real "$@"
...@@ -211,15 +211,6 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz ...@@ -211,15 +211,6 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz
rm -Rf Bundle-Data/mac rm -Rf Bundle-Data/mac
mv $SKELETON_TMP Bundle-Data/mac mv $SKELETON_TMP Bundle-Data/mac
[% IF c("var/tor-browser") -%]
# Install a "tor" shim that sets the working directory. See #10030.
for tbdir in "${TBDIRS[@]}"
do
mv "$tbdir/$TORBINPATH/tor" "$tbdir/$TORBINPATH/tor.real"
cp Bundle-Data/mac-tor.sh "$tbdir/$TORCONFIGPATH/tor"
done
[% END -%]
tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x
[% END %] [% END %]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment