Clone/New-Cli-Installer
1
0
Fork 0
mirror of https://github.com/CachyOS/New-Cli-Installer.git synced 2025-02-02 22:07:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

👷 simplify

Browse Source
This commit is contained in:
Vladislav Nepogodin 2022-02-24 02:34:46 +04:00
parent 833de6f064
commit efffe9e113
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/tui.cpp
View File

@ -45,41 +45,37 @@ bool exit_done() noexcept {
auto* config_instance = Config::instance(); auto* config_instance = Config::instance();
auto& config_data = config_instance->data(); auto& config_data = config_instance->data();
static constexpr auto CloseInstBody = "Close installer?"; static constexpr auto close_inst_body = "\nClose installer?\n";
const auto& mountpoint = std::get<std::string>(config_data["MOUNTPOINT"]); const auto& mountpoint = std::get<std::string>(config_data["MOUNTPOINT"]);
const auto& target_mnt = fmt::format(FMT_COMPILE("findmnt --list -o TARGET | grep {} 2>/dev/null"), mountpoint); const auto& target_mnt = fmt::format(FMT_COMPILE("findmnt --list -o TARGET | grep {} 2>/dev/null"), mountpoint);
if (!target_mnt.empty()) { if (!target_mnt.empty()) {
utils::final_check(); utils::final_check();
const auto& checklist = std::get<std::string>(config_data["CHECKLIST"]); const auto& checklist = std::get<std::string>(config_data["CHECKLIST"]);
const auto& do_close = detail::yesno_widget(fmt::format(FMT_COMPILE("\n{}\n{}\n"), CloseInstBody, checklist), size(HEIGHT, LESS_THAN, 20) | size(WIDTH, LESS_THAN, 40)); const auto& do_close = detail::yesno_widget(fmt::format(FMT_COMPILE("{}{}\n"), close_inst_body, checklist), size(HEIGHT, LESS_THAN, 20) | size(WIDTH, LESS_THAN, 40));
/* clang-format off */ /* clang-format off */
if (!do_close) { return false; } if (!do_close) { return false; }
/* clang-format on */ /* clang-format on */
spdlog::info("exit installer."); spdlog::info("exit installer.");
static constexpr auto LogInfo = "Would you like to save\nthe installation-log to the installed system?\nIt will be copied to\n"; static constexpr auto LogInfo = "Would you like to save\nthe installation-log\nto the installed system?\nIt will be copied to\n";
const auto& do_save_log = detail::yesno_widget(fmt::format(FMT_COMPILE("\n{} {}/cachyos-install.log\n"), LogInfo, mountpoint), size(HEIGHT, LESS_THAN, 20) | size(WIDTH, LESS_THAN, 40)); const auto& do_save_log = detail::yesno_widget(fmt::format(FMT_COMPILE("\n{} {}/cachyos-install.log\n"), LogInfo, mountpoint), size(HEIGHT, LESS_THAN, 20) | size(WIDTH, LESS_THAN, 40));
if (do_save_log) { if (do_save_log) {
std::filesystem::copy_file("/tmp/cachyos-install.log", fmt::format(FMT_COMPILE("{}/cachyos-install.log"), mountpoint), fs::copy_options::overwrite_existing); std::filesystem::copy_file("/tmp/cachyos-install.log", fmt::format(FMT_COMPILE("{}/cachyos-install.log"), mountpoint), fs::copy_options::overwrite_existing);
} }
utils::umount_partitions();
utils::clear_screen();
return true;
} else {
const auto& do_close = detail::yesno_widget(fmt::format(FMT_COMPILE("\n{}\n"), CloseInstBody), size(HEIGHT, LESS_THAN, 10) | size(WIDTH, LESS_THAN, 40));
/* clang-format off */
if (!do_close) { return false; }
/* clang-format on */
utils::umount_partitions(); utils::umount_partitions();
utils::clear_screen(); utils::clear_screen();
return true; return true;
} }
return false; const auto& do_close = detail::yesno_widget(close_inst_body, size(HEIGHT, LESS_THAN, 10) | size(WIDTH, LESS_THAN, 40));
#else /* clang-format off */
return true; if (!do_close) { return false; }
/* clang-format on */
utils::umount_partitions();
utils::clear_screen();
#endif #endif
return true;
} }
void btrfs_subvolumes() noexcept { void btrfs_subvolumes() noexcept {