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

🚧 update mounting step

Browse Source
This commit is contained in:
Vladislav Nepogodin 2022-06-14 04:01:40 +04:00
parent 4a472d7954
commit 0ed5f1cc81
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/misc.cpp
View File

@ -20,10 +20,10 @@ namespace fs = std::filesystem;
namespace tui {
// Revised to deal with partition sizes now being displayed to the user
bool confirm_mount([[maybe_unused]] const std::string_view& part_user) {
bool confirm_mount([[maybe_unused]] const std::string_view& part_user, bool quite) {
#ifdef NDEVENV
const auto& ret_status = utils::exec(fmt::format(FMT_COMPILE("mount | grep {}"), part_user), true);
if (ret_status != "0") {
if (!quite && (ret_status != "0")) {
detail::infobox_widget("\nMount Failed!\n");
std::this_thread::sleep_for(std::chrono::seconds(2));
return false;
@ -35,9 +35,10 @@ bool confirm_mount([[maybe_unused]] const std::string_view& part_user) {
auto& partitions = std::get<std::vector<std::string>>(config_data["PARTITIONS"]);
auto& number_partitions = std::get<std::int32_t>(config_data["NUMBER_PARTITIONS"]);
detail::infobox_widget("\nMount Successful!\n");
std::this_thread::sleep_for(std::chrono::seconds(2));
if (!quite) {
detail::infobox_widget("\nMount Successful!\n");
std::this_thread::sleep_for(std::chrono::seconds(2));
}
// TODO: reimplement natively
const auto& str = utils::make_multiline(partitions);
const auto& cmd = fmt::format(FMT_COMPILE("echo \"{0}\" | sed \"s~{1} [0-9]*[G-M]~~\" | sed \"s~{1} [0-9]*\\.[0-9]*[G-M]~~\" | sed s~{1}$' -'~~"), str, partition);

2
src/misc.hpp
View File

@ -4,7 +4,7 @@
#include <string_view> // for string_view
namespace tui {
bool confirm_mount([[maybe_unused]] const std::string_view& part_user);
bool confirm_mount([[maybe_unused]] const std::string_view& part_user, bool quite = false);
void set_fsck_hook() noexcept;
void set_cache() noexcept;
void edit_configs() noexcept;

2
src/tui.cpp
View File

@ -1099,7 +1099,7 @@ bool mount_current_partition(bool force) noexcept {
#endif
/* clang-format off */
if (!force) { confirm_mount(fmt::format(FMT_COMPILE("{}{}"), mountpoint, mount_dev)); }
confirm_mount(fmt::format(FMT_COMPILE("{}{}"), mountpoint, mount_dev), force);
/* clang-format on */
// Identify if mounted partition is type "crypt" (LUKS on LVM, or LUKS alone)