Merge identifier/folder in $pathForFile$inBundle$.

diff --git a/Library.mm b/Library.mm
index 58576876c17345be283b5feea6450410710a00f8..e30a4ddb6e3b8cd570597fc406160ec54d497af2 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -329,12 +329,13 @@ static NSString *$getTheme$(NSArray *files, NSArray *themes = Themes_) {
 }
 // }}}
 // $pathForFile$inBundle$() {{{
-static NSString *$pathForFile$inBundle$(NSString *file, NSString *identifier, NSString *folder, bool use) {
+static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool use) {
+    NSString *identifier = [bundle bundleIdentifier];
     NSMutableArray *names = [NSMutableArray arrayWithCapacity:8];
 
     if (identifier != nil)
         [names addObject:[NSString stringWithFormat:@"Bundles/%@/%@", identifier, file]];
-    if (folder != nil) {
+    if (NSString *folder = [[bundle bundlePath] lastPathComponent]) {
         [names addObject:[NSString stringWithFormat:@"Folders/%@/%@", folder, file]];
         NSString *base([folder stringByDeletingPathExtension]);
         if ([base hasSuffix:@"~iphone"])
@@ -370,10 +371,6 @@ static NSString *$pathForFile$inBundle$(NSString *file, NSString *identifier, NS
 
     return nil;
 }
-
-static NSString *$pathForFile$inBundle$(NSString *file, NSBundle *bundle, bool use) {
-    return $pathForFile$inBundle$(file, [bundle bundleIdentifier], [[bundle bundlePath] lastPathComponent], use);
-}
 // }}}
 
 static NSString *$pathForIcon$(SBApplication *self, NSString *suffix = @"") {