aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-05-17 05:26:54 +0000
committerNick Mathewson <nickm@torproject.org>2005-05-17 05:26:54 +0000
commit356114c28e1170a269ef6a054b78f20f49eba4e4 (patch)
tree696348f293d668eb91b5a0bb2ae4807a1e469b8a /contrib
parent6e555535923185b02904500077223bd8d3130489 (diff)
downloadtor-356114c28e1170a269ef6a054b78f20f49eba4e4.tar
tor-356114c28e1170a269ef6a054b78f20f49eba4e4.tar.gz
OSX 10.4.1 really really really wants startup items to be owned by wheel:root.
svn:r4257
Diffstat (limited to 'contrib')
-rw-r--r--contrib/osx/TorPostflight4
-rw-r--r--contrib/osx/package.sh8
2 files changed, 8 insertions, 4 deletions
diff --git a/contrib/osx/TorPostflight b/contrib/osx/TorPostflight
index 284fcfc30..36cc2a999 100644
--- a/contrib/osx/TorPostflight
+++ b/contrib/osx/TorPostflight
@@ -63,3 +63,7 @@ if [ ! -d /Library/StartupItems/Tor ]; then
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
+fi
diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh
index 5658650b7..d0661038a 100644
--- a/contrib/osx/package.sh
+++ b/contrib/osx/package.sh
@@ -61,7 +61,7 @@ Tor is a system for using the internet anonymously, and allowing
others to do so.
EOF
-find $BUILD_DIR/tor_packageroot -print0 |sudo xargs -0 chown root:admin
+find $BUILD_DIR/tor_packageroot -print0 |sudo xargs -0 chown root:wheel
$PACKAGEMAKER -build \
-p $BUILD_DIR/output/Tor.pkg \
@@ -74,7 +74,7 @@ $PACKAGEMAKER -build \
mkdir -p $BUILD_DIR/privoxyconf_packageroot/Library/Privoxy
cp contrib/osx/privoxy.config $BUILD_DIR/privoxyconf_packageroot/Library/Privoxy/config
-find $BUILD_DIR/privoxyconf_packageroot -print0 |sudo xargs -0 chown root:admin
+find $BUILD_DIR/privoxyconf_packageroot -print0 |sudo xargs -0 chown root:wheel
$PACKAGEMAKER -build \
-p $BUILD_DIR/output/privoxyconf.pkg \
@@ -88,7 +88,7 @@ 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:admin
+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 \
@@ -137,7 +137,7 @@ cp ChangeLog $DOC/Advanced/ChangeLog.txt
### Package it all into a DMG
-find $BUILD_DIR/output -print0 | sudo xargs -0 chown root:admin
+find $BUILD_DIR/output -print0 | sudo xargs -0 chown root:wheel
mv $BUILD_DIR/output "$BUILD_DIR/Tor $VERSION Bundle"
rm -f "Tor $VERSION Bundle.dmg"