summaryrefslogtreecommitdiff
path: root/contrib/osx/package.sh
diff options
context:
space:
mode:
authorAndrew Lewman <andrew@torproject.org>2006-07-27 03:02:47 +0000
committerAndrew Lewman <andrew@torproject.org>2006-07-27 03:02:47 +0000
commit8ae177dad68a1ddd1404dfd663ddfb25f2689fd6 (patch)
tree48cb7f34b081c7e81081e29f4e3c94a203c69b6b /contrib/osx/package.sh
parentcd45eb6175db6ad5b2f959bbe9591f120dcdb77a (diff)
downloadtor-8ae177dad68a1ddd1404dfd663ddfb25f2689fd6.tar.gz
tor-8ae177dad68a1ddd1404dfd663ddfb25f2689fd6.zip
The whole process works from preflight to postflight creating a clean
Tor install with proper config file edits svn:r6914
Diffstat (limited to 'contrib/osx/package.sh')
-rw-r--r--contrib/osx/package.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh
index 9a85d12d03..7f4277170c 100644
--- a/contrib/osx/package.sh
+++ b/contrib/osx/package.sh
@@ -83,6 +83,7 @@ cp contrib/osx/ReadMe.rtf $BUILD_DIR/tor_resources
#cp contrib/osx/License.rtf $BUILD_DIR/tor_resources
chmod 755 contrib/osx/TorPostflight
cp contrib/osx/TorPostflight $BUILD_DIR/tor_resources/postflight
+cp contrib/osx/TorPreFlight $BUILD_DIR/tor_resources/preflight
cp contrib/osx/addsysuser $BUILD_DIR/tor_resources/addsysuser
cp contrib/osx/Tor_Uninstaller.applescript $BUILD_DIR/tor_resources/Tor_Uninstaller.applescript
cp contrib/osx/Tor_Uninstaller.app.tar.gz $BUILD_DIR/tor_resources/Tor_Uninstaller.app.tar.gz
@@ -138,11 +139,7 @@ $PACKAGEMAKER -build \
-d contrib/osx/PrivoxyConfDesc.plist
### Make Startup Script package
-# If Tiger or later, use launchd. Otherwise, use StartupItems
-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
@@ -153,7 +150,6 @@ else
-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.