Resolve OSX installer bugs 147 and 148

svn:r4333

configure.in

@@ -484,7 +484,7 @@ CFLAGS="$CFLAGS -Wall -g -O2"
 
 echo "confdir: $CONFDIR"
 
-AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile)
+AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile)
 
 if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then
   ./contrib/updateVersions.pl

contrib/osx/Makefile.am

@@ -3,6 +3,6 @@ confdir = $(sysconfdir)/tor
 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
 

contrib/osx/TorPostflight

@@ -58,11 +58,10 @@ if [ ! -e /var/log/tor -o -L /var/log/tor ]; then
   ln -sf $LOGDIR tor
 fi
 
-if [ ! -d /Library/StartupItems/Tor ]; then
+if [ -d /Library/StartupItems/Tor ]; then
-  mkdir -p /Library/StartupItems/Tor
+  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

contrib/osx/TorStartupDesc.plist → contrib/osx/TorStartupDesc.plist.in

@@ -5,6 +5,6 @@
 	<key>IFPkgDescriptionTitle</key>
 	<string>Tor Startup Script</string>
 	<key>IFPkgDescriptionVersion</key>
-	<string>0.0.9.1</string>
+	<string>@VERSION@</string>
 </dict>
 </plist>