diff --git a/scripts/fbt/appmanifest.py b/scripts/fbt/appmanifest.py index 98f794453..5ed8c260b 100644 --- a/scripts/fbt/appmanifest.py +++ b/scripts/fbt/appmanifest.py @@ -393,6 +393,8 @@ class ApplicationsCGenerator: app_path = "/ext/apps" if app.fap_category: app_path += f"/{app.fap_category}" + else: + app_path += "/assets" app_path += f"/{app.appid}.fap" return f""" {{ diff --git a/scripts/fbt_tools/fbt_extapps.py b/scripts/fbt_tools/fbt_extapps.py index 8c8a07655..b48df6095 100644 --- a/scripts/fbt_tools/fbt_extapps.py +++ b/scripts/fbt_tools/fbt_extapps.py @@ -176,7 +176,8 @@ class AppBuilder: deployable = False app_artifacts.dist_entries.append((deployable, fal_path)) else: - fap_path = f"apps/{'assets' if self.app.apptype == FlipperAppType.MENUEXTERNAL else self.app.fap_category}/{app_artifacts.compact.name}" + category = 'assets' if self.app.apptype == FlipperAppType.MENUEXTERNAL and not self.app.fap_category else self.app.fap_category + fap_path = f"apps/{category}/{app_artifacts.compact.name}" app_artifacts.dist_entries.append( (self.app.is_default_deployable, fap_path) )