From 81f11358396e9dce3d085a1c4310700c5db234e3 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sun, 25 Jun 2023 23:06:01 +0100
Subject: [PATCH] Use standard "assets" dir for FAPPs

---
 scripts/fbt/appmanifest.py       | 2 +-
 scripts/fbt_tools/fbt_extapps.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/fbt/appmanifest.py b/scripts/fbt/appmanifest.py
index 86ed066ed..f570491ea 100644
--- a/scripts/fbt/appmanifest.py
+++ b/scripts/fbt/appmanifest.py
@@ -380,7 +380,7 @@ class ApplicationsCGenerator:
             return f"""
     {{.app = NULL,
      .name = "{app.name}",
-     .appid = "/ext/apps/.Main/{app.appid}.fap",
+     .appid = "/ext/apps/assets/{app.appid}.fap",
      .stack_size = 0,
      .icon = {f"&{app.icon}" if app.icon else "NULL"},
      .flags = {'|'.join(f"FlipperInternalApplicationFlag{flag}" for flag in app.flags)}}}"""
diff --git a/scripts/fbt_tools/fbt_extapps.py b/scripts/fbt_tools/fbt_extapps.py
index 2441ed883..455f841b4 100644
--- a/scripts/fbt_tools/fbt_extapps.py
+++ b/scripts/fbt_tools/fbt_extapps.py
@@ -179,7 +179,7 @@ class AppBuilder:
                         deployable = False
                 app_artifacts.dist_entries.append((deployable, fal_path))
         else:
-            fap_path = f"apps/{'.Main' if self.app.apptype == FlipperAppType.FAPP else self.app.fap_category}/{app_artifacts.compact.name}"
+            fap_path = f"apps/{'assets' if self.app.apptype == FlipperAppType.FAPP else self.app.fap_category}/{app_artifacts.compact.name}"
             app_artifacts.dist_entries.append(
                 (self.app.is_default_deployable, fap_path)
             )