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

🚧 hot fix

Browse Source
This commit is contained in:
Vladislav Nepogodin 2022-01-01 06:04:55 +04:00
parent 9b352c9e2b
commit 31a3b6ae0f
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tui.cpp
View File

@ -423,11 +423,11 @@ void install_cust_pkgs() noexcept {
if (hostcache) {
// utils::exec(fmt::format("pacstrap {} {}", mountpoint, packages));
detail::follow_process_log_widget({"/sbin/pacstrap", mountpoint, packages});
detail::follow_process_log_widget({"/bin/sh", "sh", "-c", fmt::format("pacstrap {} {}", mountpoint, packages)});
return;
}
// utils::exec(fmt::format("pacstrap -c {} {}", mountpoint, packages));
detail::follow_process_log_widget({"/sbin/pacstrap", "-c", mountpoint, packages});
detail::follow_process_log_widget({"/bin/sh", "sh", "-c", fmt::format("pacstrap -c {} {}", mountpoint, packages)});
#endif
}
@ -461,7 +461,7 @@ void install_systemd_boot() noexcept {
utils::arch_chroot(fmt::format("bootctl --path={} install", uefi_mount));
// utils::exec(fmt::format("pacstrap {} systemd-boot-manager", mountpoint));
detail::follow_process_log_widget({"/sbin/pacstrap", mountpoint, "systemd-boot-manager"});
detail::follow_process_log_widget({"/bin/sh", "sh", "-c", fmt::format("pacstrap {} systemd-boot-manager", mountpoint)});
utils::arch_chroot("sdboot-manage gen");
// Check if the volume is removable. If so, dont use autodetect
@ -611,7 +611,7 @@ void install_base() noexcept {
#ifdef NDEVENV
// filter_packages
// utils::exec(fmt::format("pacstrap {} {} |& tee /tmp/pacstrap.log", mountpoint, packages));
detail::follow_process_log_widget({"/sbin/pacstrap", mountpoint, packages});
detail::follow_process_log_widget({"/bin/sh", "sh", "-c", fmt::format("pacstrap {} {} |& tee /tmp/pacstrap.log", mountpoint, packages)});
std::filesystem::copy("/etc/pacman.conf", fmt::format("{}/etc/pacman.conf", mountpoint));
#endif

4
src/utils.cpp
View File

@ -218,7 +218,7 @@ auto make_multiline(const std::string_view& str, bool reverse, const std::string
static constexpr auto functor = [](auto&& rng) {
return std::string_view(&*rng.begin(), static_cast<size_t>(ranges::distance(rng)));
};
// static constexpr auto second = [](auto&& rng) { return rng != ""; };
static constexpr auto second = [](auto&& rng) { return rng != ""; };
#if defined(__clang__)
const auto& splitted_view = str
@ -232,7 +232,7 @@ auto make_multiline(const std::string_view& str, bool reverse, const std::string
#endif
std::vector<std::string> lines{};
ranges::for_each(view_res /* | ranges::views::filter(second)*/, [&](auto&& rng) { lines.emplace_back(rng); });
ranges::for_each(view_res | ranges::views::filter(second), [&](auto&& rng) { lines.emplace_back(rng); });
if (reverse) {
ranges::reverse(lines);
}