Drop ~iphone from ~iphone.app.

diff --git a/Library.mm b/Library.mm
index 91bda3d2ad5f645d313a8695f1dce741f340c0e1..17452bc3a44ce9cc27931e6cfa89747d7106938d 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -323,8 +323,12 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool u
 
     if (identifier != nil)
         [names addObject:[NSString stringWithFormat:@"Bundles/%@/%@", identifier, file]];
 
     if (identifier != nil)
         [names addObject:[NSString stringWithFormat:@"Bundles/%@/%@", identifier, file]];

-    if (NSString *folder = [[bundle bundlePath] lastPathComponent])
+    if (NSString *folder = [[bundle bundlePath] lastPathComponent]) {

         [names addObject:[NSString stringWithFormat:@"Folders/%@/%@", folder, file]];
         [names addObject:[NSString stringWithFormat:@"Folders/%@/%@", folder, file]];

+        NSString *base([folder stringByDeletingPathExtension]);
+        if ([base hasSuffix:@"~iphone"])
+            [names addObject:[NSString stringWithFormat:@"Folders/%@.%@/%@", [base substringWithRange:NSMakeRange(0, [base length] - 7)], [folder pathExtension], file]];
+    }

     if (ui)
         [names addObject:[NSString stringWithFormat:@"UIImages/%@", file]];
 
     if (ui)
         [names addObject:[NSString stringWithFormat:@"UIImages/%@", file]];