diff options
| author | Andrew Lewman <andrew@torproject.org> | 2007-03-11 23:59:37 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2007-03-11 23:59:37 +0000 |
| commit | f406d661a48476ce7ec3c4ad39f0859befc4b610 (patch) | |
| tree | 4a8a4d5b2ae1a96c84bb1889a89124406177cea5 /contrib | |
| parent | 4abf2163fc90a1beab66babb35872c3010b6aab1 (diff) | |
| download | tor-f406d661a48476ce7ec3c4ad39f0859befc4b610.tar tor-f406d661a48476ce7ec3c4ad39f0859befc4b610.tar.gz | |
In response to FlySpray #341, move to an more Apple friendly logfile in
the OSX bundles.
svn:r9803
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/osx/Makefile.am | 3 | ||||
| -rw-r--r-- | contrib/osx/TorPostflight | 21 |
2 files changed, 7 insertions, 17 deletions
diff --git a/contrib/osx/Makefile.am b/contrib/osx/Makefile.am index 5fd70ecd9..f7174a3ea 100644 --- 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 524e5a665..e20090150 100644 --- 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 |