aboutsummaryrefslogtreecommitdiff
path: root/contrib/osx/TorPostflight
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/osx/TorPostflight')
-rw-r--r--contrib/osx/TorPostflight15
1 files changed, 1 insertions, 14 deletions
diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index 49e965170..3f52b9850 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