[or-cvs] Backport OSX binary un-installer and perm change.

[phobos at seul.org]

Update of /home/or/cvsroot/tor/contrib/osx
In directory moria:/tmp/cvs-serv10802

Modified Files:
      Tag: tor-0_1_1-patches
	TorPostflight package.sh 
Added Files:
      Tag: tor-0_1_1-patches
	Tor_Uninstaller_bin.app 
Log Message:
Backport OSX binary un-installer and perm change.


Index: TorPostflight
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/TorPostflight,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -p -d -r1.10 -r1.10.2.1
--- TorPostflight	11 Mar 2006 06:13:08 -0000	1.10
+++ TorPostflight	25 Jun 2006 04:03:45 -0000	1.10.2.1
@@ -14,6 +14,11 @@ TARGET=$2/Library/Tor
 TORDIR=$TARGET/var/lib/tor
 LOGDIR=$TARGET/var/log/tor
 
+# Check defaults for TARGET
+if [ "$TARGET" == "//Library/Tor" ]; then
+	TARGET=/Library/Tor
+fi
+
 # Create user $TORUSER in group daemon.  If it's already there, great.
 $ADDSYSUSER $TORUSER "Tor System user" $TORDIR
 
@@ -75,7 +80,9 @@ fi
 # Copy Uninstaller
 if [ -f $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.applescript ]; then 
    cp $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.applescript $TARGET/Tor_Uninstaller.applescript
+   cp $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller_bin.app $TARGET/Tor_Uninstaller_bin.app
    chmod 755 $TARGET/Tor_Uninstaller.applescript
+   chmod 755 $TARGET/Tor_Uninstaller_bin.app
 fi
 
 if [ -f $PACKAGE_PATH/Contents/Resources/uninstall_tor_bundle.sh ]; then

--- NEW FILE: Tor_Uninstaller_bin.app ---
(This appears to be a binary file; contents omitted.)

Index: package.sh
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/package.sh,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -p -d -r1.20 -r1.20.2.1
--- package.sh	10 Apr 2006 07:05:20 -0000	1.20
+++ package.sh	25 Jun 2006 04:03:45 -0000	1.20.2.1
@@ -78,6 +78,7 @@ chmod 755 contrib/osx/TorPostflight
 cp contrib/osx/TorPostflight $BUILD_DIR/tor_resources/postflight
 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_bin.app $BUILD_DIR/tor_resources/Tor_Uninstaller_bin.app
 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
@@ -93,10 +94,10 @@ EOF
 DOC=$BUILD_DIR/tor_resources/documents
 mkdir $DOC
 mkdir $DOC/howto
-cp doc/website/stylesheet.css doc/website/tor-doc-osx.html.* $DOC/howto
-cp doc/website/tor-doc-server.html.* $DOC/howto
-cp doc/website/tor-hidden-service.html.* $DOC/howto
-cp doc/website/tor-switchproxy.html.* $DOC/howto
+#cp doc/website/stylesheet.css doc/website/tor-doc-osx.html.* $DOC/howto
+#cp doc/website/tor-doc-server.html.* $DOC/howto
+#cp doc/website/tor-hidden-service.html.* $DOC/howto
+#cp doc/website/tor-switchproxy.html.* $DOC/howto
 #mkdir $DOC/img
 #cp doc/img/screenshot-osx* $DOC/img
 cp AUTHORS $DOC/AUTHORS.txt