[or-cvs] OSX 10.4.1 really really really wants startup items to be o...

[Nick Mathewson]

Update of /home/or/cvsroot/tor/contrib/osx
In directory moria.mit.edu:/tmp/cvs-serv29215/contrib/osx

Modified Files:
	TorPostflight package.sh 
Log Message:
OSX 10.4.1 really really really wants startup items to be owned by wheel:root.

Index: TorPostflight
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/TorPostflight,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TorPostflight	18 Mar 2005 22:43:46 -0000	1.5
+++ TorPostflight	17 May 2005 05:26:54 -0000	1.6
@@ -63,3 +63,7 @@
 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

Index: package.sh
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/package.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- package.sh	15 May 2005 13:13:03 -0000	1.6
+++ package.sh	17 May 2005 05:26:54 -0000	1.7
@@ -61,7 +61,7 @@
 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 @@
 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 @@
 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 @@
 
 ### 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"