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

🚧 fix v3 detection

Browse Source
This commit is contained in:
Vladislav Nepogodin 2022-08-14 19:37:10 +04:00
parent af3a07387b
commit ea82bbb4cc
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils.cpp
View File

@ -1469,8 +1469,8 @@ void id_system() noexcept {
}
void try_v3() noexcept {
const auto& ret_status = utils::exec("/lib/ld-linux-x86-64.so.2 --help | grep \"x86-64-v3 (supported, searched)\" &> /dev/null", true);
if (ret_status != "0") {
const auto& ret_status = utils::exec("/lib/ld-linux-x86-64.so.2 --help|grep 'x86-64-v3 ('|awk '{print $1}' 2> /dev/null");
if (ret_status != "x86-64-v3") {
spdlog::warn("x86-64-v3 is not supported");
return;
}
@ -1478,7 +1478,7 @@ void try_v3() noexcept {
#ifdef NDEVENV
static constexpr auto pacman_conf = "/etc/pacman.conf";
static constexpr auto pacman_conf_cachyos = "/tmp/pacman.conf";
static constexpr auto pacman_conf_cachyos = "/etc/pacman-more.conf";
static constexpr auto pacman_conf_path_backup = "/etc/pacman.conf.bak";
std::error_code err{};
@ -1490,10 +1490,10 @@ void try_v3() noexcept {
utils::exec("pacman-key --recv-keys F3B607488DB35A47 --keyserver keyserver.ubuntu.com", true);
utils::exec("pacman-key --lsign-key F3B607488DB35A47", true);
fs::copy(pacman_conf, pacman_conf_cachyos, err);
utils::exec(fmt::format(FMT_COMPILE("gawk -i inplace -f /usr/share/cachyos-installer/install-repo.awk {}"), pacman_conf_cachyos), true);
utils::exec(fmt::format(FMT_COMPILE("sed -i 's/Architecture = auto/#Architecture = auto/' {}"), pacman_conf_cachyos));
utils::exec(fmt::format(FMT_COMPILE("sed -i 's/#<disabled_v3>//g' {}"), pacman_conf_cachyos));
spdlog::info("Backup old config");
spdlog::info("backup old config");
fs::rename(pacman_conf, pacman_conf_path_backup, err);
spdlog::info("CachyOS -v3 Repo changed");