[or-cvs] Backport: Resolve OSX installer bugs 147 and 148

[Nick Mathewson]

Update of /home/or/cvsroot/tor/contrib/osx
In directory moria:/tmp/cvs-serv27105/contrib/osx

Modified Files:
      Tag: tor-0_1_0-patches
	Makefile.am TorPostflight 
Added Files:
      Tag: tor-0_1_0-patches
	TorStartupDesc.plist.in 
Log Message:
Backport: Resolve OSX installer bugs 147 and 148

Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- Makefile.am	5 Jan 2005 02:46:25 -0000	1.2
+++ Makefile.am	7 Jun 2005 18:26:26 -0000	1.2.2.1
@@ -3,6 +3,6 @@
 EXTRA_DIST = PrivoxyConfDesc.plist PrivoxyConfInfo.plist    \
     ReadMe.rtf StartupParameters.plist Tor TorBundleDesc.plist.in        \
     TorBundleInfo.plist.in TorBundleWelcome.rtf TorDesc.plist.in        \
-    TorInfo.plist.in TorStartupDesc.plist TorStartupInfo.plist            \
+    TorInfo.plist.in TorStartupDesc.plist.in TorStartupInfo.plist            \
     package.sh privoxy.config TorPostflight addsysuser
 

Index: TorPostflight
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/TorPostflight,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- TorPostflight	17 May 2005 05:26:54 -0000	1.6
+++ TorPostflight	7 Jun 2005 18:26:26 -0000	1.6.2.1
@@ -58,11 +58,10 @@
   ln -sf $LOGDIR tor
 fi
 
-if [ ! -d /Library/StartupItems/Tor ]; then
-  mkdir -p /Library/StartupItems/Tor
+if [ -d /Library/StartupItems/Tor ]; then
+  rm -f /Library/StartupItems/Tor/Tor.loc
+  echo "$TARGET" > /Library/StartupItems/Tor/Tor.loc
 fi
-rm -f /Library/StartupItems/Tor/Tor.loc
-echo "$TARGET" > /Library/StartupItems/Tor/Tor.loc
 
 if [ -d /Library/StartupItems/Privoxy ]; then
   find /Library/StartupItems/Privoxy -print0 | xargs -0 chown root:wheel

--- NEW FILE: TorStartupDesc.plist.in ---
(This appears to be a binary file; contents omitted.)