diff options
| author | Nick Mathewson <nickm@torproject.org> | 2005-06-07 18:21:32 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2005-06-07 18:21:32 +0000 |
| commit | fa140e878701ca1d37d38e588681827c57c04b73 (patch) | |
| tree | fb3d39f2c11da359a26f7d5b78970110e327b258 /contrib | |
| parent | 1a5c5452b4efc4d6fb2f882805fc6a0f9a50a2de (diff) | |
| download | tor-fa140e878701ca1d37d38e588681827c57c04b73.tar tor-fa140e878701ca1d37d38e588681827c57c04b73.tar.gz | |
Resolve OSX installer bugs 147 and 148
svn:r4333
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/osx/Makefile.am | 2 | ||||
| -rw-r--r-- | contrib/osx/TorPostflight | 7 | ||||
| -rw-r--r-- | contrib/osx/TorStartupDesc.plist.in (renamed from contrib/osx/TorStartupDesc.plist) | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/contrib/osx/Makefile.am b/contrib/osx/Makefile.am index 11380a04b..447132ea3 100644 --- a/contrib/osx/Makefile.am +++ b/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 diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight index 36cc2a999..0dd905110 100644 --- a/contrib/osx/TorPostflight +++ b/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 - 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 diff --git a/contrib/osx/TorStartupDesc.plist b/contrib/osx/TorStartupDesc.plist.in index b94a12c38..b0a48fafe 100644 --- a/contrib/osx/TorStartupDesc.plist +++ b/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> |