OSX gets confused when you have two ways to start the same program.

svn:r6915

diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index 9f8d990b33e505c3035e302251c82b3415dd7c74..580b97fb025e8ee2c8a0c10e7a7a3cf486476361 100644 (file)
--- a/contrib/osx/TorPostflight
+++ b/contrib/osx/TorPostflight
@@ -124,6 +124,7 @@ fi
 # Determine how to start by OS Version
 if [ $OS = "tiger" ]; then
   if [ -f $PACKAGE_PATH/Contents/Resources/net.freehaven.tor.plist ]; then
+     rm -f /Library/StartupItems/Tor
      cp $PACKAGE_PATH/Contents/Resources/net.freehaven.tor.plist /System/Library/LaunchDaemons/net.freehaven.tor.plist
      chmod 644 /System/Library/LaunchDaemons/net.freehaven.tor.plist
      echo "#--START required settings--" >> $TARGET/torrc