Fix bundle location

Author: lostintangent

ios/CodePush/CodePush.h

@@ -70,6 +70,7 @@ failCallback:(void (^)(NSError *err))failCallback;
 @interface CodePushPackage : NSObject
 
 + (void)downloadPackage:(NSDictionary *)updatePackage
+ expectedBundleFileName:(NSString *)expectedBundleFileName
        progressCallback:(void (^)(long long, long long))progressCallback
            doneCallback:(void (^)())doneCallback
            failCallback:(void (^)(NSError *err))failCallback;
@@ -113,6 +114,7 @@ failCallback:(void (^)(NSError *err))failCallback;
                       error:(NSError **)error;
 
 + (NSString *)findMainBundleInFolder:(NSString *)folderPath
+                    expectedFileName:(NSString *)expectedFileName
                                error:(NSError **)error;
 
 + (NSString *)assetsFolderName;

ios/CodePush/CodePush.m

@@ -419,7 +419,9 @@ - (void)applicationWillResignActive
                                 forKey:BinaryBundleDateKey];
     }
 
-    [CodePushPackage downloadPackage:mutableUpdatePackage
+    [CodePushPackage
+        downloadPackage:mutableUpdatePackage
+        expectedBundleFileName:[bundleResourceName stringByAppendingPathExtension:bundleResourceExtension]
         // The download is progressing forward
         progressCallback:^(long long expectedContentLength, long long receivedContentLength) {
             dispatch_async(_methodQueue, ^{

ios/CodePush/CodePushPackage.m

@@ -205,6 +205,7 @@ + (BOOL)isCodePushError:(NSError *)err
 }
 
 + (void)downloadPackage:(NSDictionary *)updatePackage
+ expectedBundleFileName:(NSString *)expectedBundleFileName
        progressCallback:(void (^)(long long, long long))progressCallback
            doneCallback:(void (^)())doneCallback
            failCallback:(void (^)(NSError *err))failCallback
@@ -360,7 +361,9 @@ + (void)downloadPackage:(NSDictionary *)updatePackage
                 }
 
                 NSString *relativeBundlePath = [CodePushUpdateUtils findMainBundleInFolder:newUpdateFolderPath
+                                                                          expectedFileName:expectedBundleFileName
                                                                                      error:&error];
+                
                 if (error) {
                     failCallback(error);
                     return;

ios/CodePush/CodePushUpdateUtils.m

@@ -118,6 +118,7 @@ + (void)copyEntriesInFolder:(NSString *)sourceFolder
 }
 
 + (NSString *)findMainBundleInFolder:(NSString *)folderPath
+                    expectedFileName:(NSString *)expectedFileName
                                error:(NSError **)error
 {
     NSArray* folderFiles = [[NSFileManager defaultManager]
@@ -132,17 +133,17 @@ + (NSString *)findMainBundleInFolder:(NSString *)folderPath
         BOOL isDir = NO;
         if ([[NSFileManager defaultManager] fileExistsAtPath:fullFilePath
                                                  isDirectory:&isDir] && isDir) {
-            NSString *mainBundlePathInFolder = [self findMainBundleInFolder:fullFilePath error:error];
+            NSString *mainBundlePathInFolder = [self findMainBundleInFolder:fullFilePath
+                                                           expectedFileName:expectedFileName
+                                                                      error:error];
             if (*error) {
                 return nil;
             }
 
             if (mainBundlePathInFolder) {
                 return [fileName stringByAppendingPathComponent:mainBundlePathInFolder];
             }
-        } else if ([[fileName pathExtension] isEqualToString:@"bundle"] ||
-                   [[fileName pathExtension] isEqualToString:@"jsbundle"] ||
-                   [[fileName pathExtension] isEqualToString:@"js"]) {
+        } else if ([fileName isEqualToString:expectedFileName]) {
             return fileName;
         }
     }