From d107a725bd4b2084a3c1b16c0858a63bc11ad3ec Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Thu, 24 Feb 2022 03:00:52 +0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20add=20openbox?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ src/tui.cpp | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8777a02..bf9f99d 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ CLI net-installer for CachyOS, inspired by manjaro-architect This installer provides online installation for CachyOS. +Fast and smooth installer for Arch based operating system. + Requirements ------------ * C++20 feature required (tested with GCC 11.1.0 and Clang 13(clang will not compile it with libstdc++ 11.1.0 because of c++20 standard ranges library) diff --git a/src/tui.cpp b/src/tui.cpp index 8589dcf..abc3049 100644 --- a/src/tui.cpp +++ b/src/tui.cpp @@ -868,7 +868,7 @@ void install_desktop() noexcept { #endif // Prep variables - const std::vector available_des{"kde", "cutefish", "xfce", "sway", "wayfire", "i3wm"}; + const std::vector available_des{"kde", "cutefish", "xfce", "sway", "wayfire", "i3wm", "openbox"}; // Create the base list of packages std::vector install_packages{}; @@ -901,6 +901,7 @@ void install_desktop() noexcept { constexpr std::string_view xfce{"xfce"}; constexpr std::string_view cutefish{"cutefish"}; constexpr std::string_view wayfire{"wayfire"}; + constexpr std::string_view openbox{"openbox"}; bool needed_xorg{}; auto found = ranges::search(desktop_env, i3wm); @@ -941,6 +942,10 @@ void install_desktop() noexcept { if (!found.empty()) { pkg_list.insert(pkg_list.cend(), {"wayfire", "wayfire-plugins-extra", "wf-config", "wf-shell", "wf-recorder", "nwg-drawer"}); } + found = ranges::search(desktop_env, openbox); + if (!found.empty()) { + pkg_list.insert(pkg_list.cend(), {"openbox", "obconf"}); + } if (needed_xorg) { pkg_list.insert(pkg_list.cend(), {"libwnck3", "xf86-input-libinput", "xf86-video-fbdev", "xf86-video-vesa", "xorg-server", "xorg-xinit", "xorg-xinput", "xorg-xkill", "xorg-xrandr", "xf86-video-amdgpu", "xf86-video-ati", "xf86-video-intel"});