[or-cvs] Backport osx binary uninstaller changes

[phobos at seul.org]

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

Modified Files:
      Tag: tor-0_1_1-patches
	TorPostflight package.sh 
Removed Files:
      Tag: tor-0_1_1-patches
	Tor_Uninstaller_bin.app 
Log Message:
Backport osx binary uninstaller changes


Index: TorPostflight
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/TorPostflight,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -p -d -r1.10.2.1 -r1.10.2.2
--- TorPostflight	25 Jun 2006 04:03:45 -0000	1.10.2.1
+++ TorPostflight	6 Jul 2006 15:52:54 -0000	1.10.2.2
@@ -80,9 +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
+   cp $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.app $TARGET/Tor_Uninstaller.app
    chmod 755 $TARGET/Tor_Uninstaller.applescript
-   chmod 755 $TARGET/Tor_Uninstaller_bin.app
+   chmod 755 $TARGET/Tor_Uninstaller.app
 fi
 
 if [ -f $PACKAGE_PATH/Contents/Resources/uninstall_tor_bundle.sh ]; then

--- Tor_Uninstaller_bin.app DELETED ---

Index: package.sh
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/package.sh,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -p -d -r1.20.2.1 -r1.20.2.2
--- package.sh	25 Jun 2006 04:03:45 -0000	1.20.2.1
+++ package.sh	6 Jul 2006 15:52:54 -0000	1.20.2.2
@@ -78,7 +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/Tor_Uninstaller.app $BUILD_DIR/tor_resources/Tor_Uninstaller.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