From e7b203d3d7f9cc3165dc402034742b45c160488a Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Sun, 21 May 2023 16:36:04 +0100 Subject: [PATCH] Automatic fap category for extmainapp --- applications/main/xtreme_app/application.fam | 1 - scripts/fbt_tools/fbt_extapps.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/applications/main/xtreme_app/application.fam b/applications/main/xtreme_app/application.fam index ce39a8739..ecb8885b3 100644 --- a/applications/main/xtreme_app/application.fam +++ b/applications/main/xtreme_app/application.fam @@ -12,6 +12,5 @@ App( icon="A_Xtreme_14", order=90, fap_libs=["assets"], - fap_category=".Main", fap_icon="xtreme_app_10px.png", ) diff --git a/scripts/fbt_tools/fbt_extapps.py b/scripts/fbt_tools/fbt_extapps.py index 1a1bad29e..9482272f3 100644 --- a/scripts/fbt_tools/fbt_extapps.py +++ b/scripts/fbt_tools/fbt_extapps.py @@ -176,7 +176,7 @@ class AppBuilder: deployable = False app_artifacts.dist_entries.append((deployable, fal_path)) else: - fap_path = f"apps/{self.app.fap_category}/{app_artifacts.compact.name}" + fap_path = f"apps/{'.Main' if self.app.apptype == FlipperAppType.EXTMAINAPP else self.app.fap_category}/{app_artifacts.compact.name}" app_artifacts.dist_entries.append( (self.app.is_default_deployable, fap_path) )