zellij-org/zellij
1
1
Fork 0
mirror of https://github.com/zellij-org/zellij.git synced 2024-12-24 01:34:38 +03:00
Code Issues Projects Releases Wiki Activity

fix(commands): add install default assets (#961)

Browse Source
This commit is contained in:
Jae-Heon Ji 2021-12-30 00:28:51 +09:00 committed by GitHub
parent 590d3479e6
commit b81268e80c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/commands.rs
View File

@ -87,6 +87,12 @@ fn create_new_client() -> ClientInfo {
ClientInfo::New(names::Generator::default().next().unwrap())
}
fn install_default_assets(opts: &CliArgs) {
let data_dir = opts.data_dir.clone().unwrap_or_else(get_default_data_dir);
#[cfg(not(disable_automatic_asset_installation))]
populate_data_dir(&data_dir);
}
fn find_indexed_session(
sessions: Vec<String>,
config_options: Options,
@ -199,6 +205,10 @@ pub(crate) fn start_client(opts: CliArgs) {
ClientInfo::New(_) => layout,
};
if create {
install_default_assets(&opts);
}
start_client_impl(
Box::new(os_input),
opts,
@ -210,10 +220,7 @@ pub(crate) fn start_client(opts: CliArgs) {
} else {
let start_client_plan = |session_name: std::string::String| {
assert_session_ne(&session_name);
let data_dir = opts.data_dir.clone().unwrap_or_else(get_default_data_dir);
#[cfg(not(disable_automatic_asset_installation))]
populate_data_dir(&data_dir);
install_default_assets(&opts);
};
if let Some(session_name) = opts.session.clone() {