Clone/New-Cli-Installer
1
0
Fork 0
mirror of https://github.com/CachyOS/New-Cli-Installer.git synced 2025-02-02 22:07:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔥 add cachyos-zsh-config

Browse Source
This commit is contained in:
Vladislav Nepogodin 2022-02-27 04:16:52 +04:00
parent dcc4a8e72e
commit 0578be9258
No known key found for this signature in database
GPG Key ID: B62C3D10C54D5DA9
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/tui.cpp
View File

@ -422,22 +422,24 @@ void create_new_user() noexcept {
break;
case 2: {
shell = "/usr/bin/fish";
#ifdef NDEVENV
std::string_view packages{"cachyos-fish-config"};
const auto& hostcache = std::get<std::int32_t>(config_data["hostcache"]);
if (hostcache) {
detail::follow_process_log_widget({"/bin/sh", "-c", fmt::format(FMT_COMPILE("pacstrap {} {} |& tee /tmp/pacstrap.log"), mountpoint, packages)});
break;
}
detail::follow_process_log_widget({"/bin/sh", "-c", fmt::format(FMT_COMPILE("pacstrap -c {} {} |& tee /tmp/pacstrap.log"), mountpoint, packages)});
#endif
break;
}
}
screen.ExitLoopClosure()();
};
detail::radiolist_widget(radiobox_list, ok_callback, &selected, &screen, shells_options_body, detail::WidgetBoxSize{.text_size = nothing});
#ifdef NDEVENV
if (selected != 1) {
const auto& packages = fmt::format(FMT_COMPILE("cachyos-{}-config"), (selected == 0) ? "zsh" : "fish");
const auto& hostcache = std::get<std::int32_t>(config_data["hostcache"]);
if (hostcache) {
detail::follow_process_log_widget({"/bin/sh", "-c", fmt::format(FMT_COMPILE("pacstrap {} {} |& tee /tmp/pacstrap.log"), mountpoint, packages)});
break;
}
detail::follow_process_log_widget({"/bin/sh", "-c", fmt::format(FMT_COMPILE("pacstrap -c {} {} |& tee /tmp/pacstrap.log"), mountpoint, packages)});
}
#endif
}
spdlog::info("default shell: [{}]", shell);