aboutsummaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authora-kenji <aks.kenji@protonmail.com>2021-05-12 20:11:06 +0200
committerGitHub <noreply@github.com>2021-05-12 20:11:06 +0200
commita24c7f79f1ac40f1e8554aa1615b0a7e020c7ca5 (patch)
treecf809552c3f676c5dee56873052a5a584e377623 /src/server
parentMerge pull request #497 from a-kenji/fix-default-keybind (diff)
parentMerge branch 'main' of https://github.com/zellij-org/zellij into set-data-dir (diff)
downloadsl0ppij-a24c7f79f1ac40f1e8554aa1615b0a7e020c7ca5.tar.gz
sl0ppij-a24c7f79f1ac40f1e8554aa1615b0a7e020c7ca5.tar.xz
sl0ppij-a24c7f79f1ac40f1e8554aa1615b0a7e020c7ca5.zip
Merge pull request #465 from a-kenji/set-data-dir
Add Complile Time System Directories
Diffstat (limited to 'src/server')
-rw-r--r--src/server/mod.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 622a3257..a4a79ca0 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -17,7 +17,7 @@ use crate::common::{
os_input_output::{set_permissions, ServerOsApi},
pty::{pty_thread_main, Pty, PtyInstruction},
screen::{screen_thread_main, ScreenInstruction},
- setup::install::populate_data_dir,
+ setup::{get_default_data_dir, install::populate_data_dir},
thread_bus::{ChannelWithContext, SenderType, SenderWithContext},
utils::consts::{ZELLIJ_IPC_PIPE, ZELLIJ_PROJ_DIR},
wasm_vm::{wasm_thread_main, PluginInstruction},
@@ -185,9 +185,9 @@ fn init_session(
let to_pty = SenderWithContext::new(SenderType::Sender(to_pty));
// Determine and initialize the data directory
- let data_dir = opts
- .data_dir
- .unwrap_or_else(|| ZELLIJ_PROJ_DIR.data_dir().to_path_buf());
+ let data_dir = opts.data_dir.unwrap_or_else(get_default_data_dir);
+
+ #[cfg(enable_automatic_assets_installation)]
populate_data_dir(&data_dir);
// Don't use default layouts in tests, but do everywhere else