From 603d6ddd9424921cbb39acca6edfef90afbd65ed Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Fri, 28 Aug 2015 15:39:50 -0700 Subject: [PATCH] Better OS X version reporting Signed-off-by: Jeffrey Morgan --- osx/installerplugins/common/mixpanel.h | 6 +++--- .../project.pbxproj | 4 ++-- .../Base.lproj/overviewplugin.xib | 8 ++++---- .../Contents/MacOS/managevmplugin | Bin 43356 -> 43388 bytes .../Contents/MacOS/overviewplugin | Bin 23212 -> 23252 bytes .../Resources/Base.lproj/overviewplugin.nib | Bin 7764 -> 7758 bytes .../Contents/MacOS/quickstartplugin | Bin 24040 -> 24080 bytes .../Contents/Resources/Scripts/main.scpt | Bin 3846 -> 3846 bytes 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/osx/installerplugins/common/mixpanel.h b/osx/installerplugins/common/mixpanel.h index 29831c8736..6847d8e9ef 100644 --- a/osx/installerplugins/common/mixpanel.h +++ b/osx/installerplugins/common/mixpanel.h @@ -49,13 +49,13 @@ for (NSString *key in properties) { props = [props stringByAppendingFormat:@",\"%@\": \"%@\"", key, [properties objectForKey:key]]; } + + NSString *osVersion = [@"Mac OS X " stringByAppendingString:[[[[NSProcessInfo processInfo] operatingSystemVersionString] componentsSeparatedByString:@" "] objectAtIndex:1]]; NSBundle* bundle = [[pane section] bundle]; NSString* token = [bundle objectForInfoDictionaryKey:@"Mixpanel Token"]; NSString* installerVersion = [bundle objectForInfoDictionaryKey:@"Installer Version"]; - NSString* payload = [NSString stringWithFormat:@"{\"event\": \"%@\", \"properties\": {\"token\": \"%@\", \"distinct_id\": \"%@\", \"os\": \"darwin\", \"version\": \"%@\" %@}}", name, token, uuid, installerVersion, props]; - - NSLog(@"%@", payload); + NSString* payload = [NSString stringWithFormat:@"{\"event\": \"%@\", \"properties\": {\"token\": \"%@\", \"distinct_id\": \"%@\", \"os\": \"darwin\", \"os version\":\"%@\", \"version\": \"%@\" %@}}", name, token, uuid, osVersion, installerVersion, props]; NSData * data = [payload dataUsingEncoding:NSUTF8StringEncoding]; NSString* base64Encoded = [data base64EncodedStringWithOptions:0]; diff --git a/osx/installerplugins/installerplugins.xcodeproj/project.pbxproj b/osx/installerplugins/installerplugins.xcodeproj/project.pbxproj index a72207ffe8..b016783119 100644 --- a/osx/installerplugins/installerplugins.xcodeproj/project.pbxproj +++ b/osx/installerplugins/installerplugins.xcodeproj/project.pbxproj @@ -51,7 +51,7 @@ 1B4C91BE1B85198100A06068 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/quickstartplugin.xib; sourceTree = ""; }; 1B4C91C11B85198100A06068 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; 1B4C91C31B85198100A06068 /* InstallerSections.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = InstallerSections.plist; sourceTree = ""; }; - 1B763C8B1B8F7F2A00981AA8 /* informationplugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = informationplugin.bundle; path = /Users/jmorgan/workspace/toolbox/osx/installerplugins/build/Debug/informationplugin.bundle; sourceTree = ""; }; + 1B763C8C1B90F96800981AA8 /* informationplugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = informationplugin.bundle; path = /Users/jmorgan/workspace/toolbox/osx/installerplugins/build/Debug/informationplugin.bundle; sourceTree = ""; }; 1B8417E71B85261F00B1FA4D /* kitematic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = kitematic.png; sourceTree = ""; }; 1B8417E81B85261F00B1FA4D /* quickstart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = quickstart.png; sourceTree = ""; }; 1BF102BB1B8BDEDA00FCB650 /* overviewplugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = overviewplugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -241,7 +241,7 @@ ); name = informationplugin; productName = informationplugin; - productReference = 1B763C8B1B8F7F2A00981AA8 /* informationplugin.bundle */; + productReference = 1B763C8C1B90F96800981AA8 /* informationplugin.bundle */; productType = "com.apple.product-type.bundle"; }; 1BF102BA1B8BDEDA00FCB650 /* overviewplugin */ = { diff --git a/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib b/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib index c492b6425b..fc6f028101 100644 --- a/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib +++ b/osx/installerplugins/overviewplugin/Base.lproj/overviewplugin.xib @@ -31,15 +31,15 @@ - + - + - + @@ -60,7 +60,7 @@