minor tweaks

Author: geof90

CodePush.js

@@ -40,7 +40,7 @@ async function checkForUpdate(deploymentKey = null) {
    * to send the app version to the server, since we are interested
    * in any updates for current app store version, regardless of hash.
    */
-  const queryPackage;
+  let queryPackage;
   if (localPackage && localPackage.appVersion && semver.compare(localPackage.appVersion, config.appVersion) === 0) {
     queryPackage = localPackage;
   } else {
@@ -70,7 +70,7 @@ async function checkForUpdate(deploymentKey = null) {
    *    because we want to avoid having to install diff updates against the binary's
    *    version, which we can't do yet on Android.
    */
-  if (!update || update.updateAppVersion || localPackage && (update.packageHash === localPackage.packageHash) || config.packageHash === localPackage.packageHash) {
+  if (!update || update.updateAppVersion || localPackage && (update.packageHash === localPackage.packageHash) || localPackage && config.packageHash === localPackage.packageHash) {
     if (update && update.updateAppVersion) {
       log("An update is available but it is targeting a newer binary version than you are currently running.");
     }

ios/CodePush/CodePush.h

@@ -116,8 +116,6 @@ failCallback:(void (^)(NSError *err))failCallback;
                                error:(NSError **)error;
 
 + (NSString *)getAssetsFolderName;
-+ (NSString *)getDefaultJsBundleName;
-
 + (NSString *)getHashForBinaryContents:(NSURL *)binaryBundleUrl
                                  error:(NSError **)error;
 

ios/CodePush/CodePushPackage.m

@@ -294,7 +294,7 @@ + (void)downloadPackage:(NSDictionary *)updatePackage
                         }
 
                         [[NSFileManager defaultManager] copyItemAtPath:[[CodePush binaryBundleURL] path]
-                                                                toPath:[newUpdateCodePushPath stringByAppendingPathComponent:[CodePushUpdateUtils getDefaultJsBundleName]]
+                                                                toPath:[newUpdateCodePushPath stringByAppendingPathComponent:[[CodePush binaryBundleURL] lastPathComponent]]
                                                                  error:&error];
                         if (error) {
                             failCallback(error);

ios/CodePush/CodePushUpdateUtils.m

@@ -5,12 +5,11 @@ @implementation CodePushUpdateUtils
 
 NSString * const AssetsFolderName = @"assets";
 NSString * const BinaryHashKey = @"CodePushBinaryHash";
-NSString * const DefaultJsBundleName = @"main.jsbundle";
 NSString * const ManifestFolderPrefix = @"CodePush";
 
 // These variables are used to cache the hash of the binary contents in memory.
 static NSString *binaryHash = nil;
-static BOOL didLoadBinaryHash = false;
+static BOOL didLoadBinaryHash = NO;
 
 + (void)addContentsOfFolderToManifest:(NSString *)folderPath
                            pathPrefix:(NSString *)pathPrefix
@@ -160,16 +159,11 @@ + (NSString *)getAssetsFolderName
     return AssetsFolderName;
 }
 
-+ (NSString *)getDefaultJsBundleName
-{
-    return DefaultJsBundleName;
-}
-
 + (NSString *)getHashForBinaryContents:(NSURL *)binaryBundleUrl
                                  error:(NSError **)error
 {
     if (!didLoadBinaryHash) {
-        didLoadBinaryHash = true;
+        didLoadBinaryHash = YES;
 
         // Get the cached hash from user preferences if it exists.
         NSString *binaryModifiedDate = [self modifiedDateStringOfFileAtURL:binaryBundleUrl];
@@ -199,7 +193,7 @@ + (NSString *)getHashForBinaryContents:(NSURL *)binaryBundleUrl
 
         NSData *jsBundleContents = [NSData dataWithContentsOfURL:binaryBundleUrl];
         NSString *jsBundleContentsHash = [self computeHashForData:jsBundleContents];
-        [manifest addObject:[[NSString stringWithFormat:@"%@/%@", [self getManifestFolderPrefix], [self getDefaultJsBundleName]] stringByAppendingString:jsBundleContentsHash]];
+        [manifest addObject:[[NSString stringWithFormat:@"%@/%@:", [self getManifestFolderPrefix], [binaryBundleUrl lastPathComponent]] stringByAppendingString:jsBundleContentsHash]];
         binaryHash = [self computeFinalHashFromManifest:manifest error:error];
 
         // Cache the hash in user preferences. This assumes that the modified date for the