Browse Source

account for when there is no -x version number present

Kevin Bradley 1 year ago
parent
commit
46e26b75a6

+ 1 - 9
bootstrapTool/Classes/HelperClass.m

@@ -96,15 +96,7 @@
     //    "-rwxr-xr-x  0 root   wheel   69424 Oct 22 03:56 ./Library/MobileSubstrate/DynamicLibraries/beigelist7.dylib\n",
     
     //-rwxr-xr-x root/staff    10860 2011-02-02 03:55 ./Library/Frameworks/CydiaSubstrate.framework/Commands/cycc
-    NSCharacterSet *whitespaceAndCharSet = [NSCharacterSet whitespaceAndNewlineCharacterSet];
-    NSScanner *stringScanner = [[NSScanner alloc] initWithString:inputLine];
-    stringScanner.charactersToBeSkipped = whitespaceAndCharSet;
-    NSString *rawValue = nil;
-    NSMutableArray *lineObjects = [NSMutableArray new];
-    while ([stringScanner scanUpToCharactersFromSet:whitespaceAndCharSet intoString:&rawValue]) {
-        NSString *value = [rawValue stringByTrimmingCharactersInSet:whitespaceAndCharSet];
-        [lineObjects addObject:value];
-    }
+    NSArray *lineObjects = [inputLine spaceDelimitedArray];
     /*
     inputLine = [inputLine stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
     inputLine = [inputLine stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"\t"]];

+ 1 - 0
bootstrapTool/Classes/NSString+Additions.h

@@ -6,4 +6,5 @@
 - (NSString *)nextVersionNumber;
 - (NSString *)trimmedString;
 - (NSArray *)properPathComponents;
+- (NSArray *)spaceDelimitedArray;
 @end

+ 13 - 4
bootstrapTool/Classes/NSString+Additions.m

@@ -4,6 +4,18 @@
 
 @implementation NSString (Additions)
 
+- (NSArray *)spaceDelimitedArray {
+    NSCharacterSet *whitespaceAndCharSet = [NSCharacterSet whitespaceAndNewlineCharacterSet];
+    NSScanner *stringScanner = [[NSScanner alloc] initWithString:self];
+    stringScanner.charactersToBeSkipped = whitespaceAndCharSet;
+    NSString *rawValue = nil;
+    NSMutableArray *lineObjects = [NSMutableArray new];
+    while ([stringScanner scanUpToCharactersFromSet:whitespaceAndCharSet intoString:&rawValue]) {
+        [lineObjects addObject:[rawValue trimmedString]];
+    }
+    return lineObjects;
+}
+
 - (NSArray *)properPathComponents {
     NSMutableArray *newSet = [[self componentsSeparatedByString:@"/"] mutableCopy];
     [newSet removeObject:@""];
@@ -18,14 +30,11 @@
     
     NSArray *comp = [self componentsSeparatedByString:@"-"];
     if (comp.count > 1){
-        
         NSString *first = comp[0];
         NSInteger bumpVersion = [[comp lastObject] integerValue]+1;
-        
         return [NSString stringWithFormat:@"%@-%lu", first, bumpVersion];
-        
     } else {
-        return nil;
+        return [self stringByAppendingString:@"-1"];
     }
     return nil;
 }