Skip to content

Commit 169ce89

Browse files
committed
Merge branch 'develop'
2 parents dadb0fc + 452959d commit 169ce89

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

Vagrant Manager/Util.m

+10
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,20 @@ + (NSString*)trimTrailingSlash:(NSString*)path {
3030
}
3131

3232
+ (NSComparisonResult)compareVersion:(NSString*)version1 toVersion:(NSString*)version2 {
33+
if(!version1 || !version2) {
34+
//if either version is nil, don't upgrade
35+
return NSOrderedDescending;
36+
}
37+
3338
return [self compareVersion:version1 toVersion:version2 skipExpansion:NO];
3439
}
3540

3641
+ (NSComparisonResult)compareVersion:(NSString*)version1 toVersion:(NSString*)version2 skipExpansion:(BOOL)skipExpansion {
42+
if(!version1 || !version2) {
43+
//if either version is nil, don't upgrade
44+
return NSOrderedDescending;
45+
}
46+
3747
NSMutableArray *version1parts = [[version1 componentsSeparatedByString:@"."] mutableCopy];
3848
NSMutableArray *version2parts = [[version2 componentsSeparatedByString:@"."] mutableCopy];
3949

Vagrant Manager/Vagrant Manager-Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>2.5.2</string>
20+
<string>2.5.3</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>2.5.2</string>
24+
<string>2.5.3</string>
2525
<key>Configuration</key>
2626
<string>${CONFIGURATION}</string>
2727
<key>LSApplicationCategoryType</key>

0 commit comments

Comments
 (0)