diff --git a/desktop/OmniNX.DesktopInstaller/Data/DeletionLists.Generated.cs b/desktop/OmniNX.DesktopInstaller/Data/DeletionLists.Generated.cs index baa7e4e..54d5009 100644 --- a/desktop/OmniNX.DesktopInstaller/Data/DeletionLists.Generated.cs +++ b/desktop/OmniNX.DesktopInstaller/Data/DeletionLists.Generated.cs @@ -92,6 +92,7 @@ public static partial class DeletionLists @"themes\systemData", @"tools", @"warmboot_mariko", + @"sept", }; public static readonly string[] clean_misc_files_to_delete = @@ -104,6 +105,7 @@ public static partial class DeletionLists @"SaltySD\saltysd_bootstrap32_5k.elf", @"SaltySD\saltysd_core.elf", @"SaltySD\saltysd_core32.elf", + @"fusee-secondary.bin", }; public static readonly string[] clean_post_restore_dirs_to_delete = @@ -185,6 +187,12 @@ public static partial class DeletionLists @"atmosphere\contents\420000000007E51B", @"atmosphere\contents\690000000000000D", @"atmosphere\contents\00FF747765616BFF", + @"atmosphere\contents\00FF0000A53BB665", + @"atmosphere\contents\0100000000000F12", + @"atmosphere\contents\010000000000bd00", + @"atmosphere\contents\4200000000000010", + @"atmosphere\contents\430000000000000B", + @"atmosphere\contents\0100000000000352", }; public static readonly string[] atmosphere_files_to_delete = @@ -223,6 +231,9 @@ public static partial class DeletionLists @"config\quickntp", @"config\sys-patch", @"config\ultrahand", + @"config\blue_pack_updater", + @"config\kefir-updater", + @"config\uberhand", }; public static readonly string[] switch_dirs_to_delete = @@ -304,6 +315,10 @@ public static partial class DeletionLists @"switch\tinfoil\db", @"themes\systemData", @"warmboot_mariko", + @"games", + @"NSPs (Tools)", + @"scripts", + @"tools", }; public static readonly string[] misc_files_to_delete = diff --git a/source/deletion_lists_clean.h b/source/deletion_lists_clean.h index 72635df..259ea7d 100644 --- a/source/deletion_lists_clean.h +++ b/source/deletion_lists_clean.h @@ -98,6 +98,7 @@ static const char* clean_misc_dirs_to_delete[] = { "sd:/themes/systemData", "sd:/tools", "sd:/warmboot_mariko", + "sd:/sept", // old Atmosphere boot chain NULL }; @@ -111,6 +112,7 @@ static const char* clean_misc_files_to_delete[] = { "sd:/SaltySD/saltysd_bootstrap32_5k.elf", "sd:/SaltySD/saltysd_core.elf", "sd:/SaltySD/saltysd_core32.elf", + "sd:/fusee-secondary.bin", // old Atmosphere boot chain NULL }; diff --git a/source/deletion_lists_update.h b/source/deletion_lists_update.h index 67fbe2c..08aa596 100644 --- a/source/deletion_lists_update.h +++ b/source/deletion_lists_update.h @@ -5,10 +5,13 @@ * Update mode only runs on an existing OmniNX install (manifest.ini), so this * list only needs: * - paths the current pack ships (removed first so the copy replaces them cleanly), - * - components OmniNX used to ship and dropped (e.g. sys-ticon), - * - boot-relevant housekeeping (logs, foreign exefs/kip patches, legacy boot files). - * Do NOT add apps, sysmodules or game title IDs a user can install on their own - * (e.g. via OmniNX Downloader); foreign-pack leftovers belong in the clean list. + * - components and folders OmniNX used to ship and dropped (e.g. sys-ticon, games/), + * - boot-relevant housekeeping (logs, foreign exefs/kip patches, legacy boot files), + * - sysmodules offered by OmniNX Downloader (may break on a new Atmosphere; + * users reinstall them via the Downloader), + * - configs of other CFW packs. + * Do NOT add user apps, app configs or game title IDs (mods/cheats); foreign-pack + * apps are removed by the clean list, which wipes switch/ and atmosphere/. * Check with: python3 tools/audit_update_list.py * After editing, regenerate the desktop list: python3 tools/generate_deletion_lists.py */ @@ -74,6 +77,14 @@ static const char* atmosphere_contents_dirs_to_delete[] = { "sd:/atmosphere/contents/420000000007E51B", "sd:/atmosphere/contents/690000000000000D", "sd:/atmosphere/contents/00FF747765616BFF", // sys-ticon (removed in 2.2.0) + // Sysmodules offered by OmniNX Downloader: removed on update, because an + // old build may not run on the new Atmosphere. Reinstall via the Downloader. + "sd:/atmosphere/contents/00FF0000A53BB665", // SysDVR + "sd:/atmosphere/contents/0100000000000F12", // Fizeau + "sd:/atmosphere/contents/010000000000bd00", // MissionControl + "sd:/atmosphere/contents/4200000000000010", // ldn_mitm + "sd:/atmosphere/contents/430000000000000B", // sys-botbase + "sd:/atmosphere/contents/0100000000000352", // emuiibo NULL }; @@ -116,6 +127,10 @@ static const char* config_dirs_to_delete[] = { "sd:/config/quickntp", "sd:/config/sys-patch", "sd:/config/ultrahand", + // Configs of other CFW packs / old Ultrahand name + "sd:/config/blue_pack_updater", + "sd:/config/kefir-updater", + "sd:/config/uberhand", NULL }; @@ -203,6 +218,11 @@ static const char* misc_dirs_to_delete[] = { "sd:/switch/tinfoil/db", "sd:/themes/systemData", "sd:/warmboot_mariko", + // Former OmniNX folders + "sd:/games", + "sd:/NSPs (Tools)", + "sd:/scripts", + "sd:/tools", NULL }; diff --git a/tools/audit_update_list.py b/tools/audit_update_list.py index b0ec31b..ef07773 100644 --- a/tools/audit_update_list.py +++ b/tools/audit_update_list.py @@ -18,11 +18,14 @@ ROOT = Path(__file__).resolve().parents[1] UPDATE_H = ROOT / "source" / "deletion_lists_update.h" PACK_PREFIX = re.compile(r"^(?:variants/[^/]+/(?:extras/hekate-ams-pro/)?|staging/)") -# Not shipped as files, but reset on purpose during updates. +# Not shipped as files, but removed on purpose during updates. INTENTIONAL = { - "config/nx-hbmenu", # hbmenu settings (hbmenu.nro is shipped) - "config/sys-patch", # sys-patch settings (sys-patch is shipped) - "switch/tinfoil/db", # stale title DB cache + "config/nx-hbmenu", # hbmenu settings (hbmenu.nro is shipped) + "config/sys-patch", # sys-patch settings (sys-patch is shipped) + "switch/tinfoil/db", # stale title DB cache + "config/blue_pack_updater", # other CFW packs + "config/kefir-updater", + "config/uberhand", # old Ultrahand name }