[or-cvs] Include package_list.txt for detailed uninstallation on osx...

[phobos@xxxxxxxx]

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

Modified Files:
	Makefile.am TorPostflight package.sh package_list.txt 
	uninstall_tor_bundle.sh 
Log Message:
Include package_list.txt for detailed uninstallation on osx. Force the
osx uninstall script to actually clean up directories as well.  Make
TorPostflight actions safer.


Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- Makefile.am	11 Mar 2006 05:23:16 -0000	1.5
+++ Makefile.am	11 Mar 2006 06:13:08 -0000	1.6
@@ -6,4 +6,4 @@ EXTRA_DIST = PrivoxyConfDesc.plist Privo
     TorInfo.plist.in TorStartupDesc.plist.in TorStartupInfo.plist            \
     package.sh privoxy.config TorPostflight addsysuser 	\
     Tor_Uninstaller.applescript uninstall_tor_bundle.sh tor-resolve.pdf \
-    tor-reference.pdf
+    tor-reference.pdf package_list.txt

Index: TorPostflight
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/TorPostflight,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -d -r1.9 -r1.10
--- TorPostflight	11 Mar 2006 05:23:18 -0000	1.9
+++ TorPostflight	11 Mar 2006 06:13:08 -0000	1.10
@@ -68,7 +68,21 @@ if [ -d /Library/StartupItems/Privoxy ];
 fi
 
 # Copy Documentation
-cp -r $PACKAGE_PATH/Contents/Resources/documents $TARGET/documents
+if [ -d $PACKAGE_PATH/Contents/Resources/documents ];then
+   cp -r $PACKAGE_PATH/Contents/Resources/documents $TARGET/documents
+fi
 
 # Copy Uninstaller
-cp -r $PACKAGE_PATH/Contents/Resources/*ninstall* $TARGET/
+if [ -f $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.applescript ]; then 
+   cp $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.applescript $TARGET/Tor_Uninstaller.applescript
+   chmod 755 $TARGET/Tor_Uninstaller.applescript
+fi
+
+if [ -f $PACKAGE_PATH/Contents/Resources/uninstall_tor_bundle.sh ]; then
+   cp $PACKAGE_PATH/Contents/Resources/uninstall_tor_bundle.sh $TARGET/uninstall_tor_bundle.sh
+   chmod 755 $TARGET/uninstall_tor_bundle.sh
+fi
+
+if [ -f $PACKAGE_PATH/Contents/Resources/package_list.txt ]; then
+   cp $PACKAGE_PATH/Contents/Resources/package_list.txt $TARGET/package_list.txt
+fi

Index: package.sh
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/package.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -d -r1.15 -r1.16
--- package.sh	11 Mar 2006 05:23:18 -0000	1.15
+++ package.sh	11 Mar 2006 06:13:08 -0000	1.16
@@ -79,6 +79,7 @@ cp contrib/osx/TorPostflight $BUILD_DIR/
 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/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
 cat <<EOF > $BUILD_DIR/tor_resources/Welcome.txt
 Tor: an anonymous Internet communication system

Index: package_list.txt
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/package_list.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- package_list.txt	19 Feb 2006 15:54:30 -0000	1.2
+++ package_list.txt	11 Mar 2006 06:13:08 -0000	1.3
@@ -2,4 +2,3 @@ Tor
 Privoxy
 torstartup
 privoxyconf
-toruninstaller

Index: uninstall_tor_bundle.sh
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/uninstall_tor_bundle.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- uninstall_tor_bundle.sh	24 Oct 2005 17:17:35 -0000	1.1
+++ uninstall_tor_bundle.sh	11 Mar 2006 06:13:08 -0000	1.2
@@ -134,6 +134,7 @@ niutil -destroy . /users/$TOR_USER
 ## clean up
 echo ". Cleaning up"
 rm -rf $TEMP_BOM_CONTENTS
+rm -rf /Library/Privoxy/ /Library/StartupItems/Tor/ /Library/StartupItems/Privoxy/ /Library/Tor/
 
 echo ". Finished"