From cacb8fae0df2b4f2f9006652ce7aedbdc293f42c Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 21 Apr 2017 13:55:44 -0700 Subject: [PATCH] GitHub issue #463 -- fix MacOS uninstall script. --- ext/installfiles/mac/uninstall.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ext/installfiles/mac/uninstall.sh b/ext/installfiles/mac/uninstall.sh index d1effb933..9bf5d6fc4 100755 --- a/ext/installfiles/mac/uninstall.sh +++ b/ext/installfiles/mac/uninstall.sh @@ -28,13 +28,11 @@ echo "Removing ZeroTier One files..." rm -rf '/Applications/ZeroTier One.app' rm -f '/usr/bin/zerotier-one' '/usr/bin/zerotier-idtool' '/usr/bin/zerotier-cli' '/Library/LaunchDaemons/com.zerotier.one.plist' -mkdir -p /tmp/ZeroTierOne_uninstall_tmp -cp "/Library/Application Support/ZeroTier/One/*.secret" /tmp/ZeroTierOne_uninstall_tmp -rm -rf '/Library/Application Support/ZeroTier/One' -mkdir -p '/Library/Application Support/ZeroTier/One' -cp "/tmp/ZeroTierOne_uninstall_tmp/*.secret" '/Library/Application Support/ZeroTier/One' -chmod 0600 "/Library/Application Support/ZeroTier/One/*.secret" -rm -rf /tmp/ZeroTierOne_uninstall_tmp + +cd '/Library/Application Support/ZeroTier/One' +if [ "`pwd`" = '/Library/Application Support/ZeroTier/One' ]; then + rm -rf *.d *.sh *.log *.old *.kext *.conf *.pkg *.dmg *.pid *.port *.save *.bin planet zerotier-* devicemap +fi echo 'Uninstall complete.' echo