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

🚧 drop cutefish

Browse Source
This commit is contained in:
Vladislav Nepogodin 2023-06-30 23:47:16 +04:00
parent 54a28595c2
commit fedda098d6
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tui.cpp
View File

@ -647,7 +647,7 @@ void install_desktop() noexcept {
#endif
// Prep variables
const std::vector<std::string> available_des{"kde", "cutefish", "xfce", "sway", "wayfire", "i3wm", "gnome", "openbox", "bspwm", "lxqt", "cinnamon", "ukui"};
const std::vector<std::string> available_des{"kde", "xfce", "sway", "wayfire", "i3wm", "gnome", "openbox", "bspwm", "lxqt", "cinnamon", "ukui"};
auto screen = ScreenInteractive::Fullscreen();
std::string desktop_env{};

13
src/utils.cpp
View File

@ -737,7 +737,6 @@ auto get_pkglist_desktop(const std::string_view& desktop_env) noexcept -> std::v
std::vector<std::string> pkg_list{};
constexpr std::string_view kde{"kde"};
constexpr std::string_view cutefish{"cutefish"};
constexpr std::string_view xfce{"xfce"};
constexpr std::string_view sway{"sway"};
constexpr std::string_view wayfire{"wayfire"};
@ -804,18 +803,6 @@ auto get_pkglist_desktop(const std::string_view& desktop_env) noexcept -> std::v
std::move_iterator(to_be_inserted.end()));
needed_xorg = true;
}
found = ranges::search(desktop_env, cutefish);
if (!found.empty()) {
/* clang-format off */
static constexpr std::array to_be_inserted{"fishui", "cutefish-calculator", "cutefish-core", "cutefish-dock",
"cutefish-filemanager", "cutefish-kwin-plugins", "cutefish-launcher", "cutefish-screenlocker",
"cutefish-settings", "cutefish-statusbar", "cutefish-terminal", "cutefish-wallpapers",
"cutefish-icons", "cutefish-qt-plugins", "libwnck3", "sddm"};
/* clang-format on */
pkg_list.insert(pkg_list.end(), std::move_iterator(to_be_inserted.begin()),
std::move_iterator(to_be_inserted.end()));
needed_xorg = true;
}
found = ranges::search(desktop_env, wayfire);
if (!found.empty()) {
pkg_list.insert(pkg_list.cend(), {"cachyos-wayfire-settings", "wayfire-desktop-git", "egl-wayland", "wayland-protocols", "wofi", "ly", "xorg-xhost", "xorg-xwayland"});