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

👷 split v1 repo with v3

Browse Source
This commit is contained in:
Vladislav Nepogodin 2023-01-19 03:43:01 +04:00
parent 7eceedf18b
commit 51a0dac44c
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/utils.cpp
View File

@ -1541,8 +1541,8 @@ void install_cachyos_repo() noexcept {
#endif
};
const auto& is_repo_added = utils::exec("cat /etc/pacman.conf | grep \"(cachyos\\|cachyos-v3\\|cachyos-testing-v3\\|cachyos-v4)\" &> /dev/null", true) == "0";
const auto& is_repo_commented = utils::exec("cat /etc/pacman.conf | grep \"cachyos\\|cachyos-v3\\|cachyos-testing-v3\\|cachyos-v4\" | grep -v \"#\\[\" | grep \"\\[\" &> /dev/null", true) == "0";
const auto& is_repo_added = utils::exec("cat /etc/pacman.conf | grep -q \"(cachyos\\|cachyos-v3\\|cachyos-testing-v3\\|cachyos-v4)\" &> /dev/null", true) == "0";
const auto& is_repo_commented = utils::exec("cat /etc/pacman.conf | grep \"cachyos\\|cachyos-v3\\|cachyos-testing-v3\\|cachyos-v4\" | grep -v \"#\\[\" | grep -q \"\\[\" &> /dev/null", true) == "0";
// Check if it's already been applied
if (!(!is_repo_added || !is_repo_commented)) {
@ -1557,18 +1557,27 @@ void install_cachyos_repo() noexcept {
const auto& isa_levels = utils::get_isa_levels();
static constexpr auto CACHYOS_V1_REPO_STR = R"(
[cachyos]
Include = /etc/pacman.d/cachyos-mirrorlist
)";
static constexpr auto CACHYOS_V3_REPO_STR = R"(
[cachyos-v3]
Include = /etc/pacman.d/cachyos-v3-mirrorlist
[cachyos]
Include = /etc/pacman.d/cachyos-mirrorlist
)";
static constexpr auto CACHYOS_V4_REPO_STR = R"(
[cachyos-v4]
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);
}