Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

2 changed files:

Changes:

  • projects/browser/Bundle-Data/mac-tor.sh deleted
    1
    -#!/bin/sh
    
    2
    -# Compiled Python modules require a compatible Python, which means 32-bit 2.6.
    
    3
    -export VERSIONER_PYTHON_VERSION=2.6
    
    4
    -export DYLD_LIBRARY_PATH=.:$DYLD_LIBRARY_PATH
    
    5
    -# Set the current working directory to the directory containing this executable,
    
    6
    -# so that pluggable transport executables can be given with relative paths. This
    
    7
    -# works around a change in OS X 10.9, where the current working directory is
    
    8
    -# otherwise set to "/" when an application bundle is started from Finder.
    
    9
    -# https://trac.torproject.org/projects/tor/ticket/10030
    
    10
    -cd "$(dirname "$0")"
    
    11
    -if [ ! -f tor.real -a -d ../../../MacOS/Tor ]; then
    
    12
    -  # On newer releases of Tor Browser, tor.real is in Contents/MacOS/Tor/.
    
    13
    -  cd ../../../MacOS/Tor
    
    14
    -fi
    
    15
    -exec ./tor.real "$@"

  • projects/browser/build
    ... ... @@ -211,15 +211,6 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz
    211 211
       rm -Rf Bundle-Data/mac
    
    212 212
       mv $SKELETON_TMP Bundle-Data/mac
    
    213 213
     
    
    214
    -  [% IF c("var/tor-browser") -%]
    
    215
    -    # Install a "tor" shim that sets the working directory. See #10030.
    
    216
    -    for tbdir in "${TBDIRS[@]}"
    
    217
    -    do
    
    218
    -      mv "$tbdir/$TORBINPATH/tor" "$tbdir/$TORBINPATH/tor.real"
    
    219
    -      cp Bundle-Data/mac-tor.sh "$tbdir/$TORCONFIGPATH/tor"
    
    220
    -    done
    
    221
    -  [% END -%]
    
    222
    -
    
    223 214
       tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x
    
    224 215
     [% END %]
    
    225 216