diff options
| author | Andrew Lewman <andrew@torproject.org> | 2008-06-15 12:51:51 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2008-06-15 12:51:51 +0000 |
| commit | 8555a768fdbb5a82a0dba2cd11fd468dd4df366d (patch) | |
| tree | c2f7bafc18ac5c7f66fdf04a1e08e6814a3012b7 /contrib/osx/TorPostflight | |
| parent | c96b15f9bc242e1de348a7bf4f38b983a04c2b65 (diff) | |
| download | tor-8555a768fdbb5a82a0dba2cd11fd468dd4df366d.tar.gz tor-8555a768fdbb5a82a0dba2cd11fd468dd4df366d.zip | |
In Steve Jobs parlance, "boom." The Tor osx bundle is now just Tor and
a startup script. This is consistent with every other OS for which we
build packages. If you want privoxy and torbutton, use the Vidalia
bundle.
svn:r15272
Diffstat (limited to 'contrib/osx/TorPostflight')
| -rw-r--r-- | contrib/osx/TorPostflight | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight index 49e9651706..3f52b98501 100644 --- a/contrib/osx/TorPostflight +++ b/contrib/osx/TorPostflight @@ -3,6 +3,7 @@ # TorPostFlight is distributed under this license # # Copyright (c) 2006 Andrew Lewman +# Copyright (c) 2008 The Tor Project # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -46,7 +47,6 @@ TORGROUP=daemon TARGET=$2/Library/Tor TORDIR=$TARGET/var/lib/tor LOGFILE=/var/log/tor.log -TORBUTTON_VERSION="1.2.0rc2" # Check defaults for TARGET if [ "$TARGET" == "//Library/Tor" ]; then @@ -97,10 +97,6 @@ cd /usr/share/man/man1 MAN1=$TARGET/share/man/man1 #ln -sf $MAN1/*.1 . -if [ -d /Library/StartupItems/Privoxy ]; then - find /Library/StartupItems/Privoxy -print0 | xargs -0 chown root:wheel -fi - # Copy Documentation if [ -d $PACKAGE_PATH/Contents/Resources/documents ];then cp -r $PACKAGE_PATH/Contents/Resources/documents $TARGET/documents @@ -125,12 +121,3 @@ if [ -d /Library/StartupItems/Tor ]; then rm -f /Library/StartupItems/Tor/Tor.loc echo "$TARGET" > /Library/StartupItems/Tor/Tor.loc fi - -# This only works if the user installing us is an Admin user. -# Otherwise, this will silently fail to install torbutton in firefox. -if [ -f /Applications/Firefox.app/Contents/MacOS/firefox ]; then - if [ -f /Library/Torbutton/torbutton-$TORBUTTON_VERSION.xpi ]; then -# Open firefox with a prompt to install the torbutton xpi - su $USER open -a /Applications/Firefox.app /Library/Torbutton/torbutton-$TORBUTTON_VERSION.xpi - fi -fi |