In response to FlySpray #341, move to an more Apple friendly logfile in

the OSX bundles.

svn:r9803

diff --git a/contrib/osx/Makefile.am b/contrib/osx/Makefile.am
index 5fd70ecd982bc01d3a74dcf2177b49befa299b4c..f7174a3ea2b0fc41e2bc51f416cb7ed9b9d8ac75 100644 (file)
--- a/contrib/osx/Makefile.am
+++ b/contrib/osx/Makefile.am
@@ -8,5 +8,4 @@ EXTRA_DIST = PrivoxyConfDesc.plist PrivoxyConfInfo.plist          \
     TorInfo.plist.in TorStartupDesc.plist.in TorStartupInfo.plist \
     package.sh privoxy.config TorPostflight addsysuser            \
     Tor_Uninstaller.applescript uninstall_tor_bundle.sh           \
-    package_list.txt tor_logo.gif                                 \
-    TorPreFlight
+    package_list.txt tor_logo.gif TorPreFlight

diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index 524e5a6650c581cc49bc32922d5f5db7eea78c9e..e20090150c6d3037f8bc0b5828ee4bc061542c2a 100644 (file)
--- a/contrib/osx/TorPostflight
+++ b/contrib/osx/TorPostflight
@@ -12,7 +12,7 @@ TORUSER=_tor
 TORGROUP=daemon
 TARGET=$2/Library/Tor
 TORDIR=$TARGET/var/lib/tor
-LOGDIR=$TARGET/var/log/tor
+LOGFILE=/var/log/tor.log
 
 # Check defaults for TARGET
 if [ "$TARGET" == "//Library/Tor" ]; then
@@ -26,16 +26,13 @@ $ADDSYSUSER $TORUSER "Tor System user" $TORDIR
 if [ ! -d $TORDIR ]; then
   mkdir -p $TORDIR
 fi
-if [ ! -d $LOGDIR ]; then
-  mkdir -p $LOGDIR
-fi
 # Check its permissions.
 chown $TORUSER $TORDIR
 chgrp daemon $TORDIR
 chmod 700 $TORDIR
-chown $TORUSER $LOGDIR
-chgrp daemon $LOGDIR
-chmod 700 $LOGDIR
+chown $TORUSER $LOGFILE
+chgrp daemon $LOGFILE
+chmod 660 $LOGFILE
 
 # Create the configuration file only if there wasn't one already.
 if [ ! -f $TARGET/torrc ]; then
@@ -57,12 +54,6 @@ cd /usr/share/man/man1
 MAN1=$TARGET/man/man1
 ln -sf $MAN1/*.1 .
 
-if [ ! -e /var/log/tor -o -L /var/log/tor ]; then
-  cd /var/log
-  rm -f tor
-  ln -sf $LOGDIR tor
-fi
-
 if [ -d /Library/StartupItems/Privoxy ]; then
   find /Library/StartupItems/Privoxy -print0 | xargs -0 chown root:wheel
 fi
@@ -75,12 +66,12 @@ fi
 # Copy Uninstaller
 if [ -f $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.applescript ]; then 
    cp $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.applescript $TARGET/Tor_Uninstaller.applescript
-   chmod 755 $TARGET/Tor_Uninstaller.applescript
+   chmod 555 $TARGET/Tor_Uninstaller.applescript
 fi
 
 if [ -f $PACKAGE_PATH/Contents/Resources/uninstall_tor_bundle.sh ]; then
    cp $PACKAGE_PATH/Contents/Resources/uninstall_tor_bundle.sh $TARGET/uninstall_tor_bundle.sh
-   chmod 755 $TARGET/uninstall_tor_bundle.sh
+   chmod 555 $TARGET/uninstall_tor_bundle.sh
 fi
 
 if [ -f $PACKAGE_PATH/Contents/Resources/package_list.txt ]; then