diff options
| author | Andrew Lewman <andrew@torproject.org> | 2006-07-16 13:58:10 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2006-07-16 13:58:10 +0000 |
| commit | 1478636f549d0791da78ef1cdd93cc5a44c3e8c2 (patch) | |
| tree | 95a9aefc712341db476195e8efc381d82ed83b62 /contrib/osx/package.sh | |
| parent | 886b10bbe2aa61fb325dec6aaae13f4804d86e2b (diff) | |
| download | tor-1478636f549d0791da78ef1cdd93cc5a44c3e8c2.tar.gz tor-1478636f549d0791da78ef1cdd93cc5a44c3e8c2.zip | |
Change the way Tor starts on OSX 10.4 vs pre-10.4. 10.4 Tor now uses
launchd for current and forward compatibility.
svn:r6766
Diffstat (limited to 'contrib/osx/package.sh')
| -rw-r--r-- | contrib/osx/package.sh | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh index 13ec2d0814..20f1af5a8f 100644 --- a/contrib/osx/package.sh +++ b/contrib/osx/package.sh @@ -82,6 +82,9 @@ cp contrib/osx/Tor_Uninstaller.app.tar.gz $BUILD_DIR/tor_resources/Tor_Uninstall cp contrib/osx/uninstall_tor_bundle.sh $BUILD_DIR/tor_resources/uninstall_tor_bundle.sh cp contrib/osx/package_list.txt $BUILD_DIR/tor_resources/package_list.txt cp contrib/osx/tor_logo.gif $BUILD_DIR/tor_resources/background.gif +if [ $OS = "tiger" OR $OS = "leopard" ]; then +cp contrib/osx/net.freehaven.tor.plist $BUILD_DIR/tor_resources/net.freehaven.tor.plist +fi cat <<EOF > $BUILD_DIR/tor_resources/Welcome.txt Tor: an anonymous Internet communication system @@ -130,17 +133,22 @@ $PACKAGEMAKER -build \ -d contrib/osx/PrivoxyConfDesc.plist ### Make Startup Script package +# If Tiger or later, use launchd. Otherwise, use StartupItems -mkdir -p $BUILD_DIR/torstartup_packageroot/Library/StartupItems/Tor -cp contrib/osx/Tor contrib/osx/StartupParameters.plist \ +if [ $OS = "tiger" ]; then + cp contrib/osx/net.freehaven.tor.plist $BUILD_DIR/tor_resources/net.freehaven.tor.plist +else + mkdir -p $BUILD_DIR/torstartup_packageroot/Library/StartupItems/Tor + cp contrib/osx/Tor contrib/osx/StartupParameters.plist \ $BUILD_DIR/torstartup_packageroot/Library/StartupItems/Tor -find $BUILD_DIR/torstartup_packageroot -print0 | sudo xargs -0 chown root:wheel -$PACKAGEMAKER -build \ - -p $BUILD_DIR/output/torstartup.pkg \ - -f $BUILD_DIR/torstartup_packageroot \ - -i contrib/osx/TorStartupInfo.plist \ - -d contrib/osx/TorStartupDesc.plist + find $BUILD_DIR/torstartup_packageroot -print0 | sudo xargs -0 chown root:wheel + $PACKAGEMAKER -build \ + -p $BUILD_DIR/output/torstartup.pkg \ + -f $BUILD_DIR/torstartup_packageroot \ + -i contrib/osx/TorStartupInfo.plist \ + -d contrib/osx/TorStartupDesc.plist +fi ### Assemble the metapackage. Packagemaker won't buld metapackages from # the command line, so we need to do it by hand. |