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

🚧 add mhwd to base install

Browse Source
This commit is contained in:
Vladislav Nepogodin 2022-02-23 00:19:50 +04:00
parent 79b90168af
commit fb2c5c1703
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/drivers.cpp
View File

@ -72,9 +72,10 @@ static void setup_graphics_card() noexcept {
auto& graphics_card = std::get<std::string>(config_data["GRAPHIC_CARD"]); auto& graphics_card = std::get<std::string>(config_data["GRAPHIC_CARD"]);
#ifdef NDEVENV #ifdef NDEVENV
const auto& mountpoint = std::get<std::string>(config_data["MOUNTPOINT"]); const auto& mountpoint = std::get<std::string>(config_data["MOUNTPOINT"]);
const auto& cachepath = std::get<std::string>(config_data["cachepath"]); const auto& cachepath = std::get<std::string>(config_data["cachepath"]);
utils::arch_chroot(fmt::format(FMT_COMPILE("mhwd --pmcachedir \"{}\" --pmroot {} -f -i pci {}"), cachepath, mountpoint, driver)); const auto& cmd_formatted = fmt::format(FMT_COMPILE("mhwd --pmcachedir \"{}\" --pmroot {} -f -i pci {} 2>>/tmp/cachyos-install.log 2>&1"), cachepath, mountpoint, driver);
tui::detail::follow_process_log_widget({"/bin/sh", "-c", cmd_formatted});
std::ofstream{fmt::format(FMT_COMPILE("{}/.video_installed"), mountpoint)}; std::ofstream{fmt::format(FMT_COMPILE("{}/.video_installed"), mountpoint)};
#endif #endif

2
src/tui.cpp
View File

@ -807,7 +807,7 @@ void install_base() noexcept {
pkg_list.emplace_back(fmt::format(FMT_COMPILE("{}-headers"), pkg)); pkg_list.emplace_back(fmt::format(FMT_COMPILE("{}-headers"), pkg));
} }
pkg_list.insert(pkg_list.cend(), {"amd-ucode", "intel-ucode"}); pkg_list.insert(pkg_list.cend(), {"amd-ucode", "intel-ucode"});
pkg_list.insert(pkg_list.cend(), {"base", "base-devel", "zsh", "cachyos-keyring", "cachyos-mirrorlist", "cachyos-v3-mirrorlist", "cachyos-hello", "cachyos-hooks", "cachyos-settings", "cachyos-rate-mirrors", "cachy-browser"}); pkg_list.insert(pkg_list.cend(), {"base", "base-devel", "zsh", "cachyos-keyring", "cachyos-mirrorlist", "cachyos-v3-mirrorlist", "cachyos-hello", "cachyos-hooks", "cachyos-settings", "cachyos-rate-mirrors", "cachy-browser", "mhwd-cachyos"});
packages = utils::make_multiline(pkg_list, false, " "); packages = utils::make_multiline(pkg_list, false, " ");
spdlog::info(fmt::format("Preparing for pkgs to install: \"{}\"", packages)); spdlog::info(fmt::format("Preparing for pkgs to install: \"{}\"", packages));

2
src/utils.cpp
View File

@ -102,7 +102,7 @@ void arch_chroot(const std::string_view& command, bool follow) noexcept {
auto& config_data = config_instance->data(); auto& config_data = config_instance->data();
const auto& mountpoint = std::get<std::string>(config_data["MOUNTPOINT"]); 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"), mountpoint, command); const auto& cmd_formatted = fmt::format(FMT_COMPILE("arch-chroot {} {} 2>>/tmp/cachyos-install.log 2>&1"), mountpoint, command);
if (follow) { if (follow) {
tui::detail::follow_process_log_widget({"/bin/sh", "-c", cmd_formatted}); tui::detail::follow_process_log_widget({"/bin/sh", "-c", cmd_formatted});
return; return;