[or-cvs] Updated OSX binary un-installer for testing.
phobos at seul.org
phobos at seul.org
Fri Jul 7 00:55:14 UTC 2006
Update of /home/or/cvsroot/tor/contrib/osx
In directory moria:/tmp/cvs-serv10066
Modified Files:
Makefile.am TorPostflight Tor_Uninstaller.applescript
package.sh
Log Message:
Updated OSX binary un-installer for testing.
Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -d -r1.10 -r1.11
--- Makefile.am 25 Jun 2006 04:02:43 -0000 1.10
+++ Makefile.am 7 Jul 2006 00:55:12 -0000 1.11
@@ -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 \
- package_list.txt tor_logo.gif Tor_Uninstaller_bin.app
+ package_list.txt tor_logo.gif Tor_Uninstaller.app.tar.gz
Index: TorPostflight
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/TorPostflight,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -d -r1.14 -r1.15
--- TorPostflight 6 Jul 2006 16:28:19 -0000 1.14
+++ TorPostflight 7 Jul 2006 00:55:12 -0000 1.15
@@ -83,6 +83,13 @@ if [ -f $PACKAGE_PATH/Contents/Resources
chmod 755 $TARGET/Tor_Uninstaller.applescript
fi
+if [ -f $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.app.tar.gz ]; then
+ cp $PACKAGE_PATH/Contents/Resources/Tor_Uninstaller.app.tar.gz $TARGET/Tor_Uninstaller.app.tar.gz
+ cd $TARGET && tar zxf Tor_Uninstaller.app.tar.gz
+ chmod -R 755 $TARGET/Tor_Uninstaller.app
+ chown -R _tor:_tor Tor_Uninstaller.app
+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
Index: Tor_Uninstaller.applescript
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/Tor_Uninstaller.applescript,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -d -r1.1 -r1.2
--- Tor_Uninstaller.applescript 24 Oct 2005 15:50:05 -0000 1.1
+++ Tor_Uninstaller.applescript 7 Jul 2006 00:55:12 -0000 1.2
@@ -35,31 +35,34 @@
-- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- ===============================================================================
--- Validate & find disk paths
-set boot_disk to (path to startup disk) as string
-set default_tor_path to boot_disk & "Library:Tor"
-set default_privoxy_path to boot_disk & "Library:Privoxy"
-set default_tor_startup_path to boot_disk & "Library:StartupItems:Tor"
-set default_privoxy_startup_path to boot_disk & "Library:StartupItems:Privoxy"
-set shell_script to default_tor_path & ":uninstall_tor_bundle.sh"
-set doomed_path_list to {default_tor_path, default_privoxy_path, default_tor_startup_path, default_privoxy_startup_path}
-
--- Display what we're removing and ask for validation
--- this is the simplest way to do this
-set remove_me to display dialog "Welcome to the Tor + Privoxy Uninstaller. This program will remove:" & return & default_tor_path & return & default_privoxy_path & return & default_tor_startup_path & return & default_privoxy_startup_path & return & return & "If this does not look right, choose Yes. Otherwise, choose No." buttons {"Yes", "No"} default button "No"
-
--- Run a shell script to do all the unix work since applescript can't see it at all
-if button returned of result is "Yes" then
- try
- do shell script (shell_script) with administrator privileges
- on error
- display dialog "Too many errors, quitting." buttons {"Quit"} default button "Quit" with icon stop giving up after 5
- quit
- end try
- -- So Long and Thanks for all the Fish!
- display dialog "Thank you for using tor!" buttons {"Ok"} giving up after 5
-else
- display dialog "Thank you for your continued use of Tor & Privoxy" buttons {"You're welcome."}
-end if
-
+on run
+
+ -- Validate & find disk paths
+ set boot_disk to (path to startup disk) as string
+ set default_tor_path to boot_disk & "Library:Tor"
+ set default_privoxy_path to boot_disk & "Library:Privoxy"
+ set default_tor_startup_path to boot_disk & "Library:StartupItems:Tor"
+ set default_privoxy_startup_path to boot_disk & "Library:StartupItems:Privoxy"
+ set shell_script to default_tor_path & ":uninstall_tor_bundle.sh"
+ set doomed_path_list to {default_tor_path, default_privoxy_path, default_tor_startup_path, default_privoxy_startup_path}
+
+ -- Display what we're removing and ask for validation
+ -- this is the simplest way to do this
+ set remove_me to display dialog "Welcome to the Tor + Privoxy Uninstaller. This program will remove:" & return & return & POSIX path of default_tor_path & return & POSIX path of default_privoxy_path & return & POSIX path of default_tor_startup_path & return & POSIX path of default_privoxy_startup_path & return & return & "If this looks correct, choose Yes. Otherwise, choose No." buttons {"Yes", "No"} default button "No"
+
+ -- Run a shell script to do all the unix work since applescript can't see it at all
+ if button returned of result is "Yes" then
+ try
+ do shell script (POSIX path of shell_script) with administrator privileges
+ on error
+ display dialog "Too many errors, quitting." buttons {"Quit"} default button "Quit" with icon stop giving up after 3
+ quit
+ end try
+ -- So Long and Thanks for all the Fish!
+ display dialog "Thank you for using tor!" buttons {"Ok"} giving up after 3
+ else
+ display dialog "Thank you for your continued use of Tor & Privoxy" buttons {"You're welcome."} giving up after 3
+ end if
+
+end run
-- We're done
\ No newline at end of file
Index: package.sh
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/package.sh,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -d -r1.25 -r1.26
--- package.sh 6 Jul 2006 16:28:19 -0000 1.25
+++ package.sh 7 Jul 2006 00:55:12 -0000 1.26
@@ -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.app.tar.gz $BUILD_DIR/tor_resources/Tor_Uninstaller.app.tar.gz
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
More information about the tor-commits
mailing list