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

🚧 fix repo addition

Browse Source
This commit is contained in:
Vladislav Nepogodin 2023-01-21 12:17:53 +04:00
parent 6d29dedd8b
commit d1d5059463
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/utils.cpp
View File

@ -28,6 +28,8 @@
#include <unistd.h> // for execvp, fork
#include <unordered_map> // for unordered_map
#include <fmt/ranges.h>
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wold-style-cast"
@ -1513,13 +1515,22 @@ void id_system() noexcept {
}
void install_cachyos_repo() noexcept {
const auto& add_arch_specific_repo = [](auto&& isa_level, [[maybe_unused]] auto&& repo_name, const auto& isa_levels, [[maybe_unused]] auto&& repos_data) {
if (ranges::contains(isa_levels, isa_level)) {
const auto& add_arch_specific_repo = [](auto&& isa_level, auto&& repo_name, const auto& isa_levels, [[maybe_unused]] auto&& repos_data) {
if (!ranges::contains(isa_levels, isa_level)) {
spdlog::warn("{} is not supported", isa_level);
return;
}
spdlog::info("{} is supported", isa_level);
const auto& is_repo_added = utils::exec(fmt::format("cat /etc/pacman.conf | grep -q \"\\[{}\\]\" &> /dev/null", repo_name), true) == "0";
const auto& is_repo_commented = utils::exec(fmt::format("cat /etc/pacman.conf | grep \"\\[{}\\]\" | grep -v \"#\\[\" | grep -q \"\\[\" &> /dev/null", repo_name), true) == "0";
// Check if it's already been applied
if (!(!is_repo_added || !is_repo_commented)) {
spdlog::info("'{}' is already added!", repo_name);
return;
}
#ifdef NDEVENV
static constexpr auto pacman_conf = "/etc/pacman.conf";
static constexpr auto pacman_conf_cachyos = "./pacman.conf";
@ -1570,16 +1581,9 @@ Include = /etc/pacman.d/cachyos-v3-mirrorlist
Include = /etc/pacman.d/cachyos-v4-mirrorlist
)";
const auto& is_cachyos_repo_added = utils::exec("cat /etc/pacman.conf | grep -q \"\\[cachyos\\]\" &> /dev/null", true) == "0";
const auto& is_cachyos_repo_commented = utils::exec("cat /etc/pacman.conf | grep \"\\[cachyos\\]\" | grep -v \"#\\[\" | grep -q \"\\[\" &> /dev/null", true) == "0";
// Check if it's already been applied
if (!is_cachyos_repo_added || !is_cachyos_repo_commented) {
add_arch_specific_repo("x86-64", "cachyos", isa_levels, CACHYOS_V1_REPO_STR);
}
add_arch_specific_repo("x86-64-v3", "cachyos-v3", isa_levels, CACHYOS_V3_REPO_STR);
add_arch_specific_repo("x86-64-v4", "cachyos-v4", isa_levels, CACHYOS_V4_REPO_STR);
add_arch_specific_repo("x86_64", "cachyos", isa_levels, CACHYOS_V1_REPO_STR);
add_arch_specific_repo("x86_64_v3", "cachyos-v3", isa_levels, CACHYOS_V3_REPO_STR);
add_arch_specific_repo("x86_64_v4", "cachyos-v4", isa_levels, CACHYOS_V4_REPO_STR);
}
bool handle_connection() noexcept {