[or-cvs] r6915: OSX gets confused when you have two ways to start the same p (tor/trunk/contrib/osx)

[phobos at seul.org]

Author: phobos
Date: 2006-07-26 23:10:23 -0400 (Wed, 26 Jul 2006)
New Revision: 6915

Modified:
   tor/trunk/contrib/osx/TorPostflight
Log:
OSX gets confused when you have two ways to start the same program.


Modified: tor/trunk/contrib/osx/TorPostflight
===================================================================
--- tor/trunk/contrib/osx/TorPostflight	2006-07-27 03:02:47 UTC (rev 6914)
+++ tor/trunk/contrib/osx/TorPostflight	2006-07-27 03:10:23 UTC (rev 6915)
@@ -124,6 +124,7 @@
 # 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