aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authora-kenji <aks.kenji@protonmail.com>2021-06-16 19:00:52 +0200
committerGitHub <noreply@github.com>2021-06-16 19:00:52 +0200
commit08ed30e8320a5d50f6d559268619c2186658190a (patch)
tree2b230ad0c22b50459e08a9e6f52b74664af58aca /src
parentdocs(changelog): improve layout errors (diff)
parentChange `layout` directory from `data` to `config` (diff)
downloadsl0ppij-08ed30e8320a5d50f6d559268619c2186658190a.tar.gz
sl0ppij-08ed30e8320a5d50f6d559268619c2186658190a.tar.xz
sl0ppij-08ed30e8320a5d50f6d559268619c2186658190a.zip
Merge pull request #577 from a-kenji/default-layouts
Change `layout` directory from `data` to `config`
Diffstat (limited to 'src')
-rw-r--r--src/install.rs7
-rw-r--r--src/main.rs13
-rw-r--r--src/tests/integration/layouts.rs2
3 files changed, 10 insertions, 12 deletions
diff --git a/src/install.rs b/src/install.rs
index 4fb69376..e7778dde 100644
--- a/src/install.rs
+++ b/src/install.rs
@@ -17,15 +17,10 @@ macro_rules! asset_map {
pub(crate) fn populate_data_dir(data_dir: &Path) {
// First run installation of default plugins & layouts
let mut assets = asset_map! {
- "assets/layouts/default.yaml" => "layouts/default.yaml",
- "assets/layouts/strider.yaml" => "layouts/strider.yaml",
- "assets/layouts/disable-status-bar.yaml" => "layouts/disable-status-bar.yaml",
- };
- assets.extend(asset_map! {
"assets/plugins/status-bar.wasm" => "plugins/status-bar.wasm",
"assets/plugins/tab-bar.wasm" => "plugins/tab-bar.wasm",
"assets/plugins/strider.wasm" => "plugins/strider.wasm",
- });
+ };
assets.insert("VERSION", VERSION.as_bytes().to_vec());
let last_version = fs::read_to_string(data_dir.join("VERSION")).unwrap_or_default();
diff --git a/src/main.rs b/src/main.rs
index 1c0dc390..6bcfa872 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -16,7 +16,7 @@ use zellij_utils::{
input::layout::Layout,
input::options::Options,
logging::*,
- setup::{get_default_data_dir, Setup},
+ setup::{find_default_config_dir, get_default_data_dir, get_layout_dir, Setup},
structopt::StructOpt,
};
@@ -36,6 +36,8 @@ pub fn main() {
process::exit(1);
}
};
+ let config_options = Options::from_cli(&config.options, opts.command.clone());
+
atomic_create_dir(&*ZELLIJ_TMP_DIR).unwrap();
atomic_create_dir(&*ZELLIJ_TMP_LOG_DIR).unwrap();
if let Some(path) = opts.server {
@@ -66,8 +68,6 @@ pub fn main() {
session_name = Some(get_active_session());
}
- let config_options = Options::from_cli(&config.options, opts.command.clone());
-
start_client(
Box::new(os_input),
opts,
@@ -81,16 +81,19 @@ pub fn main() {
.clone()
.unwrap_or_else(|| names::Generator::default().next().unwrap());
assert_session_ne(&session_name);
+
// Determine and initialize the data directory
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);
+ let layout_dir = config_options.layout_dir.or_else(|| {
+ get_layout_dir(opts.config_dir.clone().or_else(find_default_config_dir))
+ });
let layout = Layout::from_path_or_default(
opts.layout.as_ref(),
opts.layout_path.as_ref(),
- &data_dir,
+ layout_dir,
);
start_client(
diff --git a/src/tests/integration/layouts.rs b/src/tests/integration/layouts.rs
index 29f8beac..6b91ba04 100644
--- a/src/tests/integration/layouts.rs
+++ b/src/tests/integration/layouts.rs
@@ -32,7 +32,7 @@ pub fn accepts_basic_layout() {
let layout = zellij_utils::input::layout::Layout::from_path_or_default(
None,
opts.layout_path.as_ref(),
- std::path::Path::new("unused"),
+ Some(std::path::Path::new("unused").into()),
);
start(