From: Andrew Lewman <andrew@torproject.org>
Date: Thu, 27 Jul 2006 03:10:23 +0000 (+0000)
Subject: OSX gets confused when you have two ways to start the same program.
X-Git-Tag: tor-0.1.1.23~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ee13cff678b8681aa4940700197fe373b83b953;p=thirdparty%2Ftor.git

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 9f8d990b33..580b97fb02 100644
--- 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