diff options
Diffstat (limited to 'contrib/osx/uninstall_tor_bundle.sh')
| -rwxr-xr-x | contrib/osx/uninstall_tor_bundle.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/contrib/osx/uninstall_tor_bundle.sh b/contrib/osx/uninstall_tor_bundle.sh index d0120be537..b7d6427559 100755 --- a/contrib/osx/uninstall_tor_bundle.sh +++ b/contrib/osx/uninstall_tor_bundle.sh @@ -33,11 +33,9 @@ ## (ie "Tor", "torstartup", ...) the list should be new-line-delimited. PACKAGE_LIST_SRC=./package_list.txt - ### this is the name of the user created in the install process of Tor TOR_USER=_tor - ### these should be constant across all osX installs (so leave them be) STARTUP_ITEMS_DIR=/Library/StartupItems PKG_RCPT_BASE_DIR=/Library/Receipts @@ -45,7 +43,6 @@ BOM_INTERMEDIATE_DIR=Contents/Resources INFO_INTERMEDIATE_DIR=$BOM_INTERMEDIATE_DIR/English.lproj TEMP_BOM_CONTENTS=/tmp/tor_uninst_scratch - ### make sure the script is being run as root, barf if not if [ "`whoami`" != "root" ]; then echo "Must be root to run the uninstall script." @@ -134,11 +131,10 @@ else niutil -destroy . /users/$TOR_USER fi - ## clean up echo ". Cleaning up" rm -rf $TEMP_BOM_CONTENTS -rm -rf /Library/Privoxy/ /Library/StartupItems/Privoxy/ /Library/Tor/ /Library/StartupItems/Tor/ +rm -rf /Library/Privoxy/ /Library/StartupItems/Privoxy/ /Library/Tor/ /Library/StartupItems/Tor/ /Library/Torbutton/ echo ". Finished" |