1
0
Fork 0
mirror of https://github.com/HamletDuFromage/aio-switch-updater.git synced 2024-11-09 12:01:44 +00:00

add way to disable hekate download for custom packs (closes https://github.com/HamletDuFromage/aio-switch-updater/issues/252)

This commit is contained in:
flb 2023-05-21 18:09:20 +02:00
parent 012b89e3f2
commit f62fa85543
3 changed files with 6 additions and 4 deletions

View file

@ -50,7 +50,7 @@ CFLAGS += $(INCLUDE) -D__SWITCH__ \
-DAPP_TITLE="\"$(APP_TITLE)\"" -DAPP_TITLE_LOWER="\"$(TARGET)\"" -DAPP_TITLE="\"$(APP_TITLE)\"" -DAPP_TITLE_LOWER="\"$(TARGET)\""
CXXFLAGS := $(CFLAGS) -std=gnu++20 -fexceptions -Wno-reorder CXXFLAGS := $(CFLAGS) -std=gnu++23 -fexceptions -Wno-reorder
ASFLAGS := -g $(ARCH) ASFLAGS := -g $(ARCH)
LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

View file

@ -33,7 +33,8 @@ Copy the `aio-switch-updater/` directory to `/switch/` on your sdcard.
- Download and update Hekate, as well as a selection of RCM payloads - Download and update Hekate, as well as a selection of RCM payloads
### ⬦ Custom Downloads ### ⬦ Custom Downloads
- A custom Atmosphère url can be entered in [this file](https://github.com/HamletDuFromage/aio-switch-updater/blob/master/custom_packs.json). Once moved to `/config/aio-switch-updater/custom_packs.json`, it will show on the `Custom Download` menu. This can be used to support third-party packs through AIO-Switch-Updater. Non-Atmosphère downloads can also be added in the `misc` category. - A custom Atmosphère url can be entered in [this file](https://github.com/HamletDuFromage/aio-switch-updater/blob/master/custom_packs.json). Once moved to `/config/aio-switch-updater/custom_packs.json`, it will show on the `Custom Download` menu. This can be used to support third-party packs through AIO-Switch-Updater. Packs whose name starts by `[PACK]` won't prompt for a Hekate download.
- Non-Atmosphère downloads can also be added in the `misc` category.
### ⬦ Download firmwares ### ⬦ Download firmwares
- Download firmware files to `/firmware` that can then be installed using DayBreak. - Download firmware files to `/firmware` that can then be installed using DayBreak.

View file

@ -34,16 +34,17 @@ bool AmsTab::CreateDownloadItems(const nlohmann::ordered_json& cfw_links, bool h
std::string text_hekate = "menus/common/download"_i18n + hekate_link[0].first; std::string text_hekate = "menus/common/download"_i18n + hekate_link[0].first;
for (const auto& link : links) { for (const auto& link : links) {
bool pack = link.first.contains("[PACK]");
std::string url = link.second; std::string url = link.second;
std::string text("menus/common/download"_i18n + link.first + "menus/common/from"_i18n + url); std::string text("menus/common/download"_i18n + link.first + "menus/common/from"_i18n + url);
listItem = new brls::ListItem(link.first); listItem = new brls::ListItem(link.first);
listItem->setHeight(LISTITEM_HEIGHT); listItem->setHeight(LISTITEM_HEIGHT);
listItem->getClickEvent()->subscribe([this, text, text_hekate, url, hekate_url, hekate, ams](brls::View* view) { listItem->getClickEvent()->subscribe([this, text, text_hekate, url, hekate_url, hekate, pack, ams](brls::View* view) {
if (!erista && !std::filesystem::exists(MARIKO_PAYLOAD_PATH)) { if (!erista && !std::filesystem::exists(MARIKO_PAYLOAD_PATH)) {
brls::Application::crash("menus/errors/mariko_payload_missing"_i18n); brls::Application::crash("menus/errors/mariko_payload_missing"_i18n);
} }
else { else {
CreateStagedFrames(text, url, erista, ams, hekate, text_hekate, hekate_url); CreateStagedFrames(text, url, erista, ams, hekate && !pack, text_hekate, hekate_url);
} }
}); });
this->RegisterListItemAction(listItem); this->RegisterListItemAction(listItem);