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

🧹 cleanup

Browse Source
This commit is contained in:
Vladislav Nepogodin 2022-08-18 19:00:33 +04:00
parent 9756a6ab15
commit 8009f1abf4
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/utils.cpp
View File

@ -245,6 +245,20 @@ auto read_whole_file(const std::string_view& filepath) noexcept -> std::string {
return buf;
}
bool write_to_file(const std::string_view& data, const std::string_view& filepath) noexcept {
std::ofstream file{filepath.data()};
if (!file.is_open()) {
spdlog::error("[WRITE_TO_FILE] '{}' open failed: {}", filepath, std::strerror(errno));
return false;
}
file << data;
return true;
}
void dump_to_log(const std::string& data) noexcept {
spdlog::info("[DUMP_TO_LOG] :=\n{}", data);
}
bool prompt_char(const char* prompt, const char* color, char* read) noexcept {
fmt::print("{}{}{}\n", color, prompt, RESET);
@ -368,8 +382,10 @@ void generate_fstab(const std::string_view& fstab_cmd) noexcept {
auto& config_data = config_instance->data();
const auto& mountpoint = std::get<std::string>(config_data["MOUNTPOINT"]);
utils::exec(fmt::format(FMT_COMPILE("{0} {1} > {1}/etc/fstab"), fstab_cmd, mountpoint));
spdlog::info("Created fstab file:\n");
utils::exec(fmt::format(FMT_COMPILE("cat {}/etc/fstab >> /tmp/cachyos-install.log"), mountpoint));
spdlog::info("Created fstab file:");
const auto& fstab_content = utils::read_whole_file(fmt::format(FMT_COMPILE("{}/etc/fstab"), mountpoint));
utils::dump_to_log(fstab_content);
const auto& swap_file = fmt::format(FMT_COMPILE("{}/swapfile"), mountpoint);
if (fs::exists(swap_file) && fs::is_regular_file(swap_file)) {

4
src/utils.hpp
View File

@ -57,7 +57,9 @@ void arch_chroot(const std::string_view& command, bool follow = true) noexcept;
void exec_follow(const std::vector<std::string>& vec, std::string& process_log, bool& running, subprocess_s& child, bool async = true) noexcept;
void exec(const std::vector<std::string>& vec) noexcept;
auto exec(const std::string_view& command, const bool& interactive = false) noexcept -> std::string;
auto read_whole_file(const std::string_view& filepath) noexcept -> std::string;
[[nodiscard]] auto read_whole_file(const std::string_view& filepath) noexcept -> std::string;
bool write_to_file(const std::string_view& data, const std::string_view& filepath) noexcept;
void dump_to_log(const std::string& data) noexcept;
[[nodiscard]] bool check_root() noexcept;
void id_system() noexcept;
[[nodiscard]] bool handle_connection() noexcept;