fix ios install to overwrite pending

Author: geof90

CodePush.h

@@ -69,6 +69,7 @@ failCallback:(void (^)(NSError *err))failCallback;
 @interface CodePushPackage : NSObject
 
 + (void)installPackage:(NSDictionary *)updatePackage
+   removePendingUpdate:(BOOL)removePendingUpdate
                  error:(NSError **)error;
 
 + (NSDictionary *)getCurrentPackage:(NSError **)error;

CodePush.m

@@ -446,6 +446,7 @@ - (void)savePendingUpdate:(NSString *)packageHash
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         NSError *error;
         [CodePushPackage installPackage:updatePackage
+                    removePendingUpdate:[self isPendingUpdate:nil]
                                   error:&error];
 
         if (error) {

CodePushPackage.m

@@ -449,6 +449,7 @@ + (void)copyEntriesInFolder:(NSString *)sourceFolder
 }
 
 + (void)installPackage:(NSDictionary *)updatePackage
+   removePendingUpdate:(BOOL)removePendingUpdate
                  error:(NSError **)error
 {
     NSString *packageHash = updatePackage[@"packageHash"];
@@ -458,19 +459,32 @@ + (void)installPackage:(NSDictionary *)updatePackage
         return;
     }
 
-    NSString *previousPackageHash = [self getPreviousPackageHash:error];
-    if (!*error && previousPackageHash && ![previousPackageHash isEqualToString:packageHash]) {
-        NSString *previousPackageFolderPath = [self getPackageFolderPath:previousPackageHash];
-        // Error in deleting old package will not cause the entire operation to fail.
-        NSError *deleteError;
-        [[NSFileManager defaultManager] removeItemAtPath:previousPackageFolderPath
-                                                   error:&deleteError];
-        if (deleteError) {
-            NSLog(@"Error deleting old package: %@", deleteError);
+    if (!removePendingUpdate) {
+        NSString *currentPackageFolderPath = [self getCurrentPackageFolderPath:error];
+        if (!*error && currentPackageFolderPath) {
+            // Error in deleting pending package will not cause the entire operation to fail.
+            NSError *deleteError;
+            [[NSFileManager defaultManager] removeItemAtPath:currentPackageFolderPath
+                                                       error:&deleteError];
+            if (deleteError) {
+                NSLog(@"Error deleting pending package: %@", deleteError);
+            }
+        }
+    } else {
+        NSString *previousPackageHash = [self getPreviousPackageHash:error];
+        if (!*error && previousPackageHash && ![previousPackageHash isEqualToString:packageHash]) {
+            NSString *previousPackageFolderPath = [self getPackageFolderPath:previousPackageHash];
+            // Error in deleting old package will not cause the entire operation to fail.
+            NSError *deleteError;
+            [[NSFileManager defaultManager] removeItemAtPath:previousPackageFolderPath
+                                                       error:&deleteError];
+            if (deleteError) {
+                NSLog(@"Error deleting old package: %@", deleteError);
+            }
         }
+        [info setValue:info[@"currentPackage"] forKey:@"previousPackage"];
     }
 
-    [info setValue:info[@"currentPackage"] forKey:@"previousPackage"];
     [info setValue:packageHash forKey:@"currentPackage"];
 
     [self updateCurrentPackageInfo:info