diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Info.plist b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Info.plist
index 0f32d0efe..ca85986a9 100644
--- a/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Info.plist
+++ b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/Info.plist
@@ -22,6 +22,8 @@
1.0
CFBundleSignature
aplt
+ CFBundleVersion
+ 1
LSMinimumSystemVersionByArchitecture
x86_64
@@ -30,7 +32,7 @@
LSRequiresCarbon
NSHumanReadableCopyright
- (c) 2013 ZeroTier Networks LLC
+ (c) 2013-2014 ZeroTier Networks LLC
WindowState
dividerCollapsed
@@ -42,9 +44,9 @@
positionOfDivider
333
savedFrame
- 7 181 602 597 0 0 1280 778
+ 36 164 602 597 0 0 1280 778
selectedTabView
- result
+ event log
diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/_CodeSignature/CodeResources b/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/_CodeSignature/CodeResources
deleted file mode 100644
index 0bdc8b6f1..000000000
--- a/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/_CodeSignature/CodeResources
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
- files
-
- Resources/Scripts/main.scpt
-
- vQEF2UWKDTa05GcIVvh0/L4W6Zs=
-
- Resources/applet.icns
-
- sINd6lbiqHD5dL8c6u79cFvVXhw=
-
- Resources/applet.rsrc
-
- HymGhWS0Me1kFd5T0sb373HR+0Y=
-
- Resources/description.rtfd/TXT.rtf
-
- LOKQWbUzEG/DjDaU0xQv2C7x5Q8=
-
-
- files2
-
- Resources/Scripts/main.scpt
-
- vQEF2UWKDTa05GcIVvh0/L4W6Zs=
-
- Resources/applet.icns
-
- sINd6lbiqHD5dL8c6u79cFvVXhw=
-
- Resources/applet.rsrc
-
- HymGhWS0Me1kFd5T0sb373HR+0Y=
-
- Resources/description.rtfd/TXT.rtf
-
- LOKQWbUzEG/DjDaU0xQv2C7x5Q8=
-
-
- rules
-
- ^Resources/
-
- ^Resources/.*\.lproj/
-
- optional
-
- weight
- 1000
-
- ^Resources/.*\.lproj/locversion.plist$
-
- omit
-
- weight
- 1100
-
- ^version.plist$
-
-
- rules2
-
- .*\.dSYM($|/)
-
- weight
- 11
-
- ^(.*/)?\.DS_Store$
-
- omit
-
- weight
- 2000
-
- ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/
-
- nested
-
- weight
- 10
-
- ^.*
-
- ^Info\.plist$
-
- omit
-
- weight
- 20
-
- ^PkgInfo$
-
- omit
-
- weight
- 20
-
- ^Resources/
-
- weight
- 20
-
- ^Resources/.*\.lproj/
-
- optional
-
- weight
- 1000
-
- ^Resources/.*\.lproj/locversion.plist$
-
- omit
-
- weight
- 1100
-
- ^[^/]+$
-
- nested
-
- weight
- 10
-
- ^embedded\.provisionprofile$
-
- weight
- 20
-
- ^version\.plist$
-
- weight
- 20
-
-
-
-
diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Info.plist b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Info.plist
new file mode 100644
index 000000000..2c45edac0
--- /dev/null
+++ b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Info.plist
@@ -0,0 +1,50 @@
+
+
+
+
+ CFBundleAllowMixedLocalizations
+
+ CFBundleDevelopmentRegion
+ English
+ CFBundleExecutable
+ applet
+ CFBundleIconFile
+ applet
+ CFBundleIdentifier
+ com.zerotier.one.ZeroTierOneMacInstallScript
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ ZeroTier One (Authenticate)
+ CFBundlePackageType
+ APPL
+ CFBundleShortVersionString
+ 1.0
+ CFBundleSignature
+ aplt
+ LSMinimumSystemVersionByArchitecture
+
+ x86_64
+ 10.6
+
+ LSRequiresCarbon
+
+ NSHumanReadableCopyright
+ (c) 2013 ZeroTier Networks LLC
+ WindowState
+
+ dividerCollapsed
+
+ eventLogLevel
+ -1
+ name
+ ScriptWindowState
+ positionOfDivider
+ 333
+ savedFrame
+ 265 106 602 597 0 0 1280 778
+ selectedTabView
+ event log
+
+
+
diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/MacOS/applet b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/MacOS/applet
new file mode 100755
index 000000000..4b52b25c9
Binary files /dev/null and b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/MacOS/applet differ
diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/PkgInfo b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/PkgInfo
new file mode 100644
index 000000000..3253614c4
--- /dev/null
+++ b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/PkgInfo
@@ -0,0 +1 @@
+APPLaplt
\ No newline at end of file
diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/Scripts/main.scpt b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/Scripts/main.scpt
new file mode 100644
index 000000000..6aff34e8e
Binary files /dev/null and b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/Scripts/main.scpt differ
diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/applet.icns b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/applet.icns
new file mode 100644
index 000000000..0cdd17086
Binary files /dev/null and b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/applet.icns differ
diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/applet.rsrc b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/applet.rsrc
new file mode 100644
index 000000000..a528ee8a9
Binary files /dev/null and b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/applet.rsrc differ
diff --git a/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/description.rtfd/TXT.rtf b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/description.rtfd/TXT.rtf
new file mode 100644
index 000000000..09700b2f2
--- /dev/null
+++ b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/description.rtfd/TXT.rtf
@@ -0,0 +1,4 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1265
+{\fonttbl}
+{\colortbl;\red255\green255\blue255;}
+}
\ No newline at end of file
diff --git a/ext/installfiles/mac/install.tmpl.sh b/ext/installfiles/mac/install.tmpl.sh
index 757732500..fcb3b69ba 100644
--- a/ext/installfiles/mac/install.tmpl.sh
+++ b/ext/installfiles/mac/install.tmpl.sh
@@ -55,6 +55,15 @@ echo 'Installing zerotier-cli command line utility...'
ln -sf "/Library/Application Support/ZeroTier/One/zerotier-one" /usr/bin/zerotier-cli
+if [ ! -f '/Library/Application Support/ZeroTier/One/authtoken.secret' ]; then
+ echo 'Pre-creating authtoken.secret for ZeroTier service...'
+ if [ $dryRun -eq 0 ]; then
+ rm -f '/Library/Application Support/ZeroTier/One/authtoken.secret'
+ head -c 1024 /dev/urandom | md5 | head -c 24 >'/Library/Application Support/ZeroTier/One/authtoken.secret'
+ chmod 0600 '/Library/Application Support/ZeroTier/One/authtoken.secret'
+ fi
+fi
+
echo 'Installing and (re-)starting zerotier-one service via launchctl...'
if [ ! -z "`launchctl list | grep -F com.zerotier.one`" ]; then
diff --git a/make-mac.mk b/make-mac.mk
index b41741588..3f5f68a14 100644
--- a/make-mac.mk
+++ b/make-mac.mk
@@ -41,7 +41,7 @@ mac-ui: FORCE
cd build-ZeroTierUI-release ; ../../Qt/bin/qmake ../ZeroTierUI/ZeroTierUI.pro ; make -j 4
strip "build-ZeroTierUI-release/ZeroTier One.app/Contents/MacOS/ZeroTier One"
cp -Rv ZeroTierUI/helpers "build-ZeroTierUI-release/ZeroTier One.app/Contents/Resources"
- cd build-ZeroTierUI-release ; codesign -s '3rd Party Mac Developer Application: ZeroTier Networks LLC' "ZeroTier One.app"
+ cd build-ZeroTierUI-release ; codesign -f -s '3rd Party Mac Developer Application: ZeroTier Networks LLC' "ZeroTier One.app"
install-mac-tap: FORCE
mkdir -p /Library/Application\ Support/ZeroTier/One