Browse Source

Mac installation scripts fixes.

Adam Ierymenko 11 years ago
parent
commit
ec3a6428b8
2 changed files with 6 additions and 5 deletions
  1. 2 1
      ext/installfiles/mac/launch.sh
  2. 4 4
      ext/installfiles/mac/uninstall.sh

+ 2 - 1
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

+ 4 - 4
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..."