From ec3a6428b88b213dd9e5e0b4152cb22a3257c41e Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 27 Dec 2013 15:30:39 -0800
Subject: [PATCH] Mac installation scripts fixes.

---
 ext/installfiles/mac/launch.sh    | 3 ++-
 ext/installfiles/mac/uninstall.sh | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ext/installfiles/mac/launch.sh b/ext/installfiles/mac/launch.sh
index 5128fdd94..ed5170291 100755
--- a/ext/installfiles/mac/launch.sh
+++ b/ext/installfiles/mac/launch.sh
@@ -8,7 +8,8 @@ export PATH="/bin:/usr/bin:/sbin:/usr/sbin:$zthome"
 # Uninstall if the .app has been thrown away
 if [ ! -d "$ztapp" ]; then
 	if [ -e "$zthome/uninstall.sh" ]; then
-		exec "$zthome/uninstall.sh"
+		cd "$zthome"
+		./uninstall.sh -q
 		exit
 	fi
 fi
diff --git a/ext/installfiles/mac/uninstall.sh b/ext/installfiles/mac/uninstall.sh
index 626db73f6..9d350709f 100755
--- a/ext/installfiles/mac/uninstall.sh
+++ b/ext/installfiles/mac/uninstall.sh
@@ -18,11 +18,11 @@ if [ "$1" = "-q" ]; then
 fi
 
 echo
-  
+
 if [ $quickAndQuiet -eq 0 ]; then  
-  echo "This will uninstall ZeroTier One, hit CTRL+C to abort."
-  echo "Waiting 5 seconds..."
-  sleep 5
+	echo "This will uninstall ZeroTier One, hit CTRL+C to abort."
+	echo "Waiting 5 seconds..."
+	sleep 5
 fi
 
 echo "Unloading and removing LaunchDaemons item..."