Installer app helper...

11 files changed, 70 insertions, 143 deletions

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 0f32d0ef..ca85986a 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 @@
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>aplt</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
 	<key>LSMinimumSystemVersionByArchitecture</key>
 	<dict>
 		<key>x86_64</key>
@@ -30,7 +32,7 @@
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>(c) 2013 ZeroTier Networks LLC</string>
+	<string>(c) 2013-2014 ZeroTier Networks LLC</string>
 	<key>WindowState</key>
 	<dict>
 		<key>dividerCollapsed</key>
@@ -42,9 +44,9 @@
 		<key>positionOfDivider</key>
 		<real>333</real>
 		<key>savedFrame</key>
-		<string>7 181 602 597 0 0 1280 778 </string>
+		<string>36 164 602 597 0 0 1280 778 </string>
 		<key>selectedTabView</key>
-		<string>result</string>
+		<string>event log</string>
 	</dict>
 </dict>
 </plist>
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 0bdc8b6f..00000000
--- a/ZeroTierUI/helpers/mac/ZeroTier One (Authenticate).app/Contents/_CodeSignature/CodeResources
+++ /dev/null
@@ -1,139 +0,0 @@
-<?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>files</key>
-	<dict>
-		<key>Resources/Scripts/main.scpt</key>
-		<data>
-		vQEF2UWKDTa05GcIVvh0/L4W6Zs=
-		</data>
-		<key>Resources/applet.icns</key>
-		<data>
-		sINd6lbiqHD5dL8c6u79cFvVXhw=
-		</data>
-		<key>Resources/applet.rsrc</key>
-		<data>
-		HymGhWS0Me1kFd5T0sb373HR+0Y=
-		</data>
-		<key>Resources/description.rtfd/TXT.rtf</key>
-		<data>
-		LOKQWbUzEG/DjDaU0xQv2C7x5Q8=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>Resources/Scripts/main.scpt</key>
-		<data>
-		vQEF2UWKDTa05GcIVvh0/L4W6Zs=
-		</data>
-		<key>Resources/applet.icns</key>
-		<data>
-		sINd6lbiqHD5dL8c6u79cFvVXhw=
-		</data>
-		<key>Resources/applet.rsrc</key>
-		<data>
-		HymGhWS0Me1kFd5T0sb373HR+0Y=
-		</data>
-		<key>Resources/description.rtfd/TXT.rtf</key>
-		<data>
-		LOKQWbUzEG/DjDaU0xQv2C7x5Q8=
-		</data>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>
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 00000000..2c45edac
--- /dev/null
+++ b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Info.plist
@@ -0,0 +1,50 @@
+<?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>CFBundleAllowMixedLocalizations</key>
+	<true/>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>applet</string>
+	<key>CFBundleIconFile</key>
+	<string>applet</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.zerotier.one.ZeroTierOneMacInstallScript</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>ZeroTier One (Authenticate)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>aplt</string>
+	<key>LSMinimumSystemVersionByArchitecture</key>
+	<dict>
+		<key>x86_64</key>
+		<string>10.6</string>
+	</dict>
+	<key>LSRequiresCarbon</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>(c) 2013 ZeroTier Networks LLC</string>
+	<key>WindowState</key>
+	<dict>
+		<key>dividerCollapsed</key>
+		<false/>
+		<key>eventLogLevel</key>
+		<integer>-1</integer>
+		<key>name</key>
+		<string>ScriptWindowState</string>
+		<key>positionOfDivider</key>
+		<real>333</real>
+		<key>savedFrame</key>
+		<string>265 106 602 597 0 0 1280 778 </string>
+		<key>selectedTabView</key>
+		<string>event log</string>
+	</dict>
+</dict>
+</plist>
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 00000000..4b52b25c
--- /dev/null
+++ b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/MacOS/applet
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 00000000..3253614c
--- /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 00000000..6aff34e8
--- /dev/null
+++ b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/Scripts/main.scpt
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 00000000..0cdd1708
--- /dev/null
+++ b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/applet.icns
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 00000000..a528ee8a
--- /dev/null
+++ b/ZeroTierUI/helpers/mac/ZeroTier One (Install).app/Contents/Resources/applet.rsrc
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 00000000..09700b2f
--- /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 75773250..fcb3b69b 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 b4174158..3f5f68a1 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