Commit e1cc3dfc authored by David Fifield's avatar David Fifield
Browse files

Remove the #10030 "tor" shim. 

It's included in upstream bundles now.
parent 81720e79

Makefile

+0 −4
Original line number Diff line number Diff line
@@ -165,10 +165,6 @@ $(PT_BUNDLE_MACOSX_I686): 


	cat $(SRCDIR)/bundle-torrc-macosx >> "$(tbbdir)"/Library/Vidalia/torrc



	# Install a "tor" shim that sets the working directory. See #10030.

	mv "$(tbbdir)"/Contents/MacOS/tor "$(tbbdir)"/Contents/MacOS/tor.real

	cp $(SRCDIR)/macosx-tor.sh "$(tbbdir)"/Contents/MacOS/tor



	cd "$(workdir)" && zip -r -9 "$@" TorBrowser_en-US.app/

	mv "$(workdir)/$@" .

macosx-tor.sh

deleted100755 → 0
+0 −8
Original line number Diff line number Diff line 
#!/bin/sh

# 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")"

exec ./tor.real "$@"