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

Merge remote-tracking branch 'refs/remotes/origin/master'

Browse Source
This commit is contained in:
Vladislav Nepogodin 2024-04-29 18:35:49 +04:00
commit 5cf7f775f3
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/utils.cpp
View File

@ -738,9 +738,10 @@ auto get_pkglist_base(const std::string_view& packages) noexcept -> std::vector<
const auto& server_mode = std::get<std::int32_t>(config_data["SERVER_MODE"]); const auto& server_mode = std::get<std::int32_t>(config_data["SERVER_MODE"]);
const auto& mountpoint_info = std::get<std::string>(config_data["MOUNTPOINT"]); const auto& mountpoint_info = std::get<std::string>(config_data["MOUNTPOINT"]);
const auto& root_filesystem = utils::get_mountpoint_fs(mountpoint_info); const auto& root_filesystem = utils::get_mountpoint_fs(mountpoint_info);
const auto& is_root_on_zfs = (root_filesystem == "zfs"); const auto& is_root_on_zfs = (root_filesystem == "zfs");
const auto& is_root_on_btrfs = (root_filesystem == "btrfs"); const auto& is_root_on_btrfs = (root_filesystem == "btrfs");
const auto& is_root_on_bcachefs = (root_filesystem == "bcachefs");
auto pkg_list = utils::make_multiline(packages, false, ' '); auto pkg_list = utils::make_multiline(packages, false, ' ');
@ -755,6 +756,9 @@ auto get_pkglist_base(const std::string_view& packages) noexcept -> std::vector<
if (is_root_on_zfs) { if (is_root_on_zfs) {
pkg_list.insert(pkg_list.cend(), {"zfs-utils"}); pkg_list.insert(pkg_list.cend(), {"zfs-utils"});
} }
if (is_root_on_bcachefs) {
pkg_list.insert(pkg_list.cend(), {"bcachefs-tools"});
}
if (server_mode == 0) { if (server_mode == 0) {
if (is_root_on_btrfs) { if (is_root_on_btrfs) {
pkg_list.insert(pkg_list.cend(), {"snapper", "btrfs-assistant-git"}); pkg_list.insert(pkg_list.cend(), {"snapper", "btrfs-assistant-git"});
@ -770,7 +774,8 @@ auto get_pkglist_base(const std::string_view& packages) noexcept -> std::vector<
pkg_list.insert(pkg_list.cend(), {"duf", "fsarchiver", "hwinfo", "inxi", "fastfetch"}); pkg_list.insert(pkg_list.cend(), {"duf", "fsarchiver", "hwinfo", "inxi", "fastfetch"});
} }
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", "mkinitcpio", "vim", "wget", "micro", "nano", "networkmanager", "openssh", "ripgrep", "sed", "rsync", "pacman-contrib", "paru", "btop"}); pkg_list.insert(pkg_list.cend(), {"base", "base-devel", "linux-firmware", "mkinitcpio", "vim", "wget", "micro", "nano", "networkmanager", "openssh", "ripgrep", "sed", "rsync", "pacman-contrib", "paru", "btop"});
pkg_list.insert(pkg_list.cend(), {"man-db", "less"});
pkg_list.insert(pkg_list.cend(), {"cachyos-mirrorlist", "cachyos-v3-mirrorlist", "cachyos-v4-mirrorlist", "cachyos-keyring"}); pkg_list.insert(pkg_list.cend(), {"cachyos-mirrorlist", "cachyos-v3-mirrorlist", "cachyos-v4-mirrorlist", "cachyos-keyring"});
return pkg_list; return pkg_list;
@ -813,10 +818,10 @@ auto get_pkglist_desktop(const std::string_view& desktop_env) noexcept -> std::v
"cachyos-nord-kde-theme-git", "cachyos-iridescent-kde", "cachyos-emerald-kde-theme-git", "cachyos-nord-kde-theme-git", "cachyos-iridescent-kde", "cachyos-emerald-kde-theme-git",
"cachyos-kde-settings", "cachyos-themes-sddm", "cachyos-wallpapers", "char-white", "dolphin", "egl-wayland", "gwenview", "cachyos-kde-settings", "cachyos-themes-sddm", "cachyos-wallpapers", "char-white", "dolphin", "egl-wayland", "gwenview",
"konsole", "kate", "kdeconnect", "kscreen", "kde-gtk-config", "khotkeys", "kinfocenter", "konsole", "kate", "kdeconnect", "kscreen", "kde-gtk-config", "khotkeys", "kinfocenter",
"kinit", "kscreen", "kwallet-pam", "kwalletmanager", "plasma-wayland-protocols", "plasma-wayland-session", "kinit", "kwallet-pam", "kwalletmanager", "plasma-wayland-protocols", "plasma-wayland-session",
"plasma-desktop", "plasma-framework5", "plasma-nm", "plasma-pa", "plasma-workspace", "plasma-integration", "plasma-desktop", "plasma-framework5", "plasma-nm", "plasma-pa", "plasma-workspace", "plasma-integration",
"plasma-firewall", "plasma-browser-integration", "plasma-systemmonitor", "plasma-thunderbolt", "plasma-firewall", "plasma-browser-integration", "plasma-systemmonitor", "plasma-thunderbolt",
"powerdevil", "ksysguard", "spectacle", "sddm", "sddm-kcm", "xsettingsd", "xdg-desktop-portal", "xdg-desktop-portal-kde"}; "powerdevil", "ksysguard", "spectacle", "sddm", "sddm-kcm", "xsettingsd", "xdg-desktop-portal", "xdg-desktop-portal-kde", "phonon-qt5-vlc"};
/* clang-format on */ /* clang-format on */
pkg_list.insert(pkg_list.end(), std::move_iterator(to_be_inserted.begin()), pkg_list.insert(pkg_list.end(), std::move_iterator(to_be_inserted.begin()),
std::move_iterator(to_be_inserted.end())); std::move_iterator(to_be_inserted.end()));