mirror of
https://github.com/CachyOS/New-Cli-Installer.git
synced 2025-02-10 04:54:38 +08:00
♻ update FTXUI
This commit is contained in:
parent
acefb4c85f
commit
460aa8308f
@ -1902,14 +1902,13 @@ void create_partitions() noexcept {
|
|||||||
auto ok_callback = [&] {
|
auto ok_callback = [&] {
|
||||||
const auto& selected_entry = menu_entries[static_cast<std::size_t>(selected)];
|
const auto& selected_entry = menu_entries[static_cast<std::size_t>(selected)];
|
||||||
if (selected_entry != optwipe && selected_entry != optauto) {
|
if (selected_entry != optwipe && selected_entry != optauto) {
|
||||||
screen.Uninstall();
|
screen.Suspend();
|
||||||
std::cout << screen.ResetPosition(true) << std::flush;
|
|
||||||
#ifdef NDEVENV
|
#ifdef NDEVENV
|
||||||
utils::exec(fmt::format("{} {}", selected_entry, std::get<std::string>(config_data["DEVICE"])), true);
|
utils::exec(fmt::format("{} {}", selected_entry, std::get<std::string>(config_data["DEVICE"])), true);
|
||||||
#else
|
#else
|
||||||
spdlog::debug("to be executed: {}", fmt::format("{} {}", selected_entry, std::get<std::string>(config_data["DEVICE"])));
|
spdlog::debug("to be executed: {}", fmt::format("{} {}", selected_entry, std::get<std::string>(config_data["DEVICE"])));
|
||||||
#endif
|
#endif
|
||||||
screen.Install();
|
screen.Resume();
|
||||||
screen.ExitLoopClosure()();
|
screen.ExitLoopClosure()();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1985,9 +1984,9 @@ void install_core_menu() noexcept {
|
|||||||
if (!utils::check_base()) {
|
if (!utils::check_base()) {
|
||||||
screen.ExitLoopClosure()();
|
screen.ExitLoopClosure()();
|
||||||
}
|
}
|
||||||
screen.Uninstall();
|
screen.Suspend();
|
||||||
tui::chroot_interactive();
|
tui::chroot_interactive();
|
||||||
screen.Install();
|
screen.Resume();
|
||||||
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
Loading…
Reference in New Issue
Block a user