From e86995c5b9bf34d81d769356ea56839bed5b052d Mon Sep 17 00:00:00 2001 From: Amitai Lanciano Date: Fri, 14 Aug 2015 09:52:15 -0700 Subject: [PATCH 1/5] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 4fd7475..2c217f3 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +* **NOTICE:** Due to some issues with the most recent versions, [2.4.1](https://github.com/lanayotech/vagrant-manager/releases/tag/2.4.1) is recommended until further notice* + +--- + Looking for the Windows version? Check out [Vagrant Manager for Windows](https://github.com/lanayotech/vagrant-manager-windows) # Vagrant Manager for OS X From e39ac48e2d26360cf3c6672ad1f81c8e434a3916 Mon Sep 17 00:00:00 2001 From: Amitai Lanciano Date: Fri, 14 Aug 2015 09:52:58 -0700 Subject: [PATCH 2/5] typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2c217f3..b4e6ea4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -* **NOTICE:** Due to some issues with the most recent versions, [2.4.1](https://github.com/lanayotech/vagrant-manager/releases/tag/2.4.1) is recommended until further notice* +**NOTICE:** Due to some issues with the most recent versions, [2.4.1](https://github.com/lanayotech/vagrant-manager/releases/tag/2.4.1) is recommended until further notice --- From 5ad847fa7db518fbff339c34e9bee984fb1ec174 Mon Sep 17 00:00:00 2001 From: Chris Ayoub Date: Sat, 10 Oct 2015 02:47:05 -0700 Subject: [PATCH 3/5] Update README.md Remove version notification --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index b4e6ea4..4fd7475 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,3 @@ -**NOTICE:** Due to some issues with the most recent versions, [2.4.1](https://github.com/lanayotech/vagrant-manager/releases/tag/2.4.1) is recommended until further notice - ---- - Looking for the Windows version? Check out [Vagrant Manager for Windows](https://github.com/lanayotech/vagrant-manager-windows) # Vagrant Manager for OS X From 582e6f4dccdad27a17b7ac4e151af2b12ce71d33 Mon Sep 17 00:00:00 2001 From: Chris Ayoub Date: Sun, 3 Jan 2016 08:03:51 -0700 Subject: [PATCH 4/5] properly parse output of vagrant version command (issue #127) --- Vagrant Manager/AppDelegate.m | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/Vagrant Manager/AppDelegate.m b/Vagrant Manager/AppDelegate.m index c9ebe2f..33be37a 100644 --- a/Vagrant Manager/AppDelegate.m +++ b/Vagrant Manager/AppDelegate.m @@ -274,26 +274,28 @@ - (void)checkForVagrantUpdates:(BOOL)showAlert { BOOL newVersionAvailable = NO; BOOL invalidOutput = YES; - NSString *currentVersion; - NSString *latestVersion; + NSString *currentVersion = nil; + NSString *latestVersion = nil; - - if([lines count] >= 2) { - NSArray *installedVersionParts = [[lines objectAtIndex:0] componentsSeparatedByString:@","]; - NSArray *latestVersionParts = [[lines objectAtIndex:1] componentsSeparatedByString:@","]; + for(NSString *line in lines) { + NSArray *cols = [line componentsSeparatedByString:@","]; - if([installedVersionParts count] >= 4 && [latestVersionParts count] >= 4) { - currentVersion = [installedVersionParts objectAtIndex:3]; - latestVersion = [latestVersionParts objectAtIndex:3]; - - if([Util compareVersion:currentVersion toVersion:latestVersion] == NSOrderedAscending) { - newVersionAvailable = YES; + if([cols count] >=4 ) { + if([[cols objectAtIndex:2] isEqualToString:@"version-installed"]) { + currentVersion = [cols objectAtIndex:3]; + } else if([[cols objectAtIndex:2] isEqualToString:@"version-latest"]) { + latestVersion = [cols objectAtIndex:3]; } - - invalidOutput = NO; } } + if(currentVersion && latestVersion) { + newVersionAvailable = [Util compareVersion:currentVersion toVersion:latestVersion] == NSOrderedAscending; + invalidOutput = NO; + } else { + invalidOutput = YES; + } + dispatch_async(dispatch_get_main_queue(), ^{ [[NSNotificationCenter defaultCenter] postNotificationName:@"vagrant-manager.vagrant-update-available" object:nil userInfo:@{@"is_update_available": [NSNumber numberWithBool:newVersionAvailable]}]; From d84f17ba93a789b32a63649e2a90f3d1054e30e6 Mon Sep 17 00:00:00 2001 From: Chris Ayoub Date: Sun, 3 Jan 2016 08:04:55 -0700 Subject: [PATCH 5/5] bump to version 2.5.1 --- Vagrant Manager.xcodeproj/project.pbxproj | 6 +++--- Vagrant Manager/Vagrant Manager-Info.plist | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Vagrant Manager.xcodeproj/project.pbxproj b/Vagrant Manager.xcodeproj/project.pbxproj index ef828c5..f908626 100644 --- a/Vagrant Manager.xcodeproj/project.pbxproj +++ b/Vagrant Manager.xcodeproj/project.pbxproj @@ -7,9 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 2609ECF51BC89CEA00E4B44E /* NFSScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 2609ECF41BC89CEA00E4B44E /* NFSScanner.m */; settings = {ASSET_TAGS = (); }; }; - 2609ECF71BC8A04600E4B44E /* rdp@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2609ECF61BC8A04600E4B44E /* rdp@2x.png */; settings = {ASSET_TAGS = (); }; }; - 2609ECF91BC8A05100E4B44E /* rdp.png in Resources */ = {isa = PBXBuildFile; fileRef = 2609ECF81BC8A05100E4B44E /* rdp.png */; settings = {ASSET_TAGS = (); }; }; + 2609ECF51BC89CEA00E4B44E /* NFSScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 2609ECF41BC89CEA00E4B44E /* NFSScanner.m */; }; + 2609ECF71BC8A04600E4B44E /* rdp@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2609ECF61BC8A04600E4B44E /* rdp@2x.png */; }; + 2609ECF91BC8A05100E4B44E /* rdp.png in Resources */ = {isa = PBXBuildFile; fileRef = 2609ECF81BC8A05100E4B44E /* rdp.png */; }; 26130E9A1B1D565200872C4F /* bm_status_icon_off.png in Resources */ = {isa = PBXBuildFile; fileRef = 26130E981B1D565200872C4F /* bm_status_icon_off.png */; }; 26130E9B1B1D565200872C4F /* bm_status_icon_off@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 26130E991B1D565200872C4F /* bm_status_icon_off@2x.png */; }; 26130E9E1B1D596400872C4F /* bm_status_icon_suspended@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 26130E9C1B1D596400872C4F /* bm_status_icon_suspended@2x.png */; }; diff --git a/Vagrant Manager/Vagrant Manager-Info.plist b/Vagrant Manager/Vagrant Manager-Info.plist index 3275c0e..0f48566 100644 --- a/Vagrant Manager/Vagrant Manager-Info.plist +++ b/Vagrant Manager/Vagrant Manager-Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.5.0 + 2.5.1 CFBundleSignature ???? CFBundleVersion - 2.5.0 + 2.5.1 Configuration ${CONFIGURATION} LSApplicationCategoryType