🧹 move generic arch-chroot into gucc

CachyOS · Jun 26, 2024 · 0623232 · 0623232
1 parent 0dec883
commit 0623232
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/gucc/include/gucc/io_utils.hpp b/gucc/include/gucc/io_utils.hpp
@@ -10,6 +10,7 @@ namespace gucc::utils {
 auto safe_getenv(const char* env_name) noexcept -> std::string_view;
 void exec(const std::vector<std::string>& vec) noexcept;
 auto exec(std::string_view command, bool interactive = false) noexcept -> std::string;
+void arch_chroot(std::string_view command, std::string_view mountpoint, bool interactive = false) noexcept;
 
 }  // namespace gucc::utils
 

diff --git a/gucc/src/io_utils.cpp b/gucc/src/io_utils.cpp
@@ -10,6 +10,7 @@
 #include <algorithm>  // for transform
 #include <fstream>    // for ofstream
 
+#include <fmt/compile.h>
 #include <fmt/ranges.h>
 #include <spdlog/spdlog.h>
 
@@ -88,4 +89,15 @@ auto exec(std::string_view command, bool interactive) noexcept -> std::string {
     return result;
 }
 
+void arch_chroot(std::string_view command, std::string_view mountpoint, bool interactive) noexcept {
+    // TODO(vnepogodin): refactor to move output into variable and print into log
+    const auto& cmd_formatted = fmt::format(FMT_COMPILE("arch-chroot {} {} 2>>/tmp/cachyos-install.log 2>&1"), mountpoint, command);
+
+#ifdef NDEVENV
+    gucc::utils::exec(cmd_formatted, interactive);
+#else
+    spdlog::info("Running with arch-chroot(interactive='{}'): '{}'", interactive, cmd_formatted);
+#endif
+}
+
 }  // namespace gucc::utils
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -125,21 +125,17 @@ void arch_chroot(const std::string_view& command, bool follow) noexcept {
     auto& config_data     = config_instance->data();
 
     const auto& mountpoint    = std::get<std::string>(config_data["MOUNTPOINT"]);
-    const auto& cmd_formatted = fmt::format(FMT_COMPILE("arch-chroot {} {} 2>>/tmp/cachyos-install.log 2>&1"), mountpoint, command);
+    const auto& headless_mode = std::get<std::int32_t>(config_data["HEADLESS_MODE"]);
 
+    const bool follow_headless = follow && headless_mode;
+    if (!follow || follow_headless) {
+        gucc::utils::arch_chroot(command, mountpoint, follow_headless);
+    }
 #ifdef NDEVENV
-    if (follow) {
-        const auto& headless_mode = std::get<std::int32_t>(config_data["HEADLESS_MODE"]);
-        if (headless_mode) {
-            gucc::utils::exec(cmd_formatted, true);
-        } else {
-            tui::detail::follow_process_log_widget({"/bin/sh", "-c", cmd_formatted});
-        }
-        return;
+    else {
+        const auto& cmd_formatted = fmt::format(FMT_COMPILE("arch-chroot {} {} 2>>/tmp/cachyos-install.log 2>&1"), mountpoint, command);
+        tui::detail::follow_process_log_widget({"/bin/sh", "-c", cmd_formatted});
     }
-    gucc::utils::exec(cmd_formatted);
-#else
-    spdlog::info("Running with arch-chroot(follow='{}'): '{}'", follow, cmd_formatted);
 #endif
 }