4 files changed, 55 insertions, 5 deletions
diff --git a/ext/installfiles/mac/check_for_updates.sh b/ext/installfiles/mac/check_for_updates.sh
deleted file mode 100755
index 05a7907c..00000000
--- a/ext/installfiles/mac/check_for_updates.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-
diff --git a/ext/installfiles/mac/com.zerotier.one.plist b/ext/installfiles/mac/com.zerotier.one.plist
new file mode 100644
index 00000000..e3c227d6
--- /dev/null
+++ b/ext/installfiles/mac/com.zerotier.one.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Label</key>
+	<string>com.zerotier.one</string>
+	<key>UserName</key>
+	<string>root</string>
+	<key>ProgramArguments</key>
+	<array>
+		<string>/Library/Application Support/ZeroTier/One/launch.sh</string>
+	</array>
+	<key>WorkingDirectory</key>
+	<string>/Library/Application Support/ZeroTier/One</string>
+	<key>StandardOutPath</key>
+	<string>/dev/null</string>
+	<key>StandardErrorPath</key>
+	<string>/dev/null</string>
+	<key>KeepAlive</key>
+	<true/>
+</dict>
+</plist>
diff --git a/ext/installfiles/mac/launch.sh b/ext/installfiles/mac/launch.sh
new file mode 100755
index 00000000..5128fdd9
--- /dev/null
+++ b/ext/installfiles/mac/launch.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+zthome="/Library/Application Support/ZeroTier/One"
+ztapp="/Applications/ZeroTier One.app"
+
+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"
+		exit
+	fi
+fi
+
+# Create the app deletion notification symlink if it does
+# not already exist.
+if [ ! -L "$zthome/shutdownIfUnreadable" ]; then
+	rm -f "$zthome/shutdownIfUnreadable"
+	ln -sf "$ztapp/Contents/Info.plist" "$zthome/shutdownIfUnreadable"
+fi
+
+# Launch ZeroTier One (not as daemon... launchd monitors it)
+exec zerotier-one
diff --git a/ext/installfiles/mac/uninstall.sh b/ext/installfiles/mac/uninstall.sh
index 4fa26d00..b9563a11 100755
--- a/ext/installfiles/mac/uninstall.sh
+++ b/ext/installfiles/mac/uninstall.sh
@@ -2,6 +2,9 @@
 
 export PATH=/bin:/usr/bin:/sbin:/usr/sbin
 
+ztpath="/Library/Application Support/ZeroTier/One"
+ztapp="/Applications/ZeroTier One.app"
+
 if [ "$UID" -ne 0 ]; then
 	echo "Must be run as root; try: sudo $0"
 	exit 1
@@ -13,19 +16,22 @@ echo "This will uninstall ZeroTier One, hit CTRL+C to abort."
 echo "Waiting 5 seconds..."
 sleep 5
 
-ztpath="/Library/Application Support/ZeroTier/One"
+echo "Unloading and removing LaunchDaemons item..."
+launchctl unload /Library/LaunchDaemons/com.zerotier.one.plist
+rm -f /Library/LaunchDaemons/com.zerotier.one.plist
 
 echo "Killing any running zerotier-one service..."
 killall -TERM zerotier-one >>/dev/null 2>&1
 sleep 3
 killall -KILL zerotier-one >>/dev/null 2>&1
+sleep 1
 
 echo "Unloading kernel extension..."
 kextunload "$ztpath/tap.kext"
 
-echo "Erasing binary and support files..."
+echo "Erasing UI app, binary, and support files..."
 cd $ztpath
-rm -rfv zerotier-one *.persist authtoken.secret identity.public *.log *.pid *.kext
+rm -rfv "$ztapp" zerotier-one *.persist authtoken.secret identity.public *.log *.pid *.kext *.sh
 
 echo "Done."
 echo