summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authora-kenji <aks.kenji@protonmail.com>2022-03-17 11:40:09 +0100
committerGitHub <noreply@github.com>2022-03-17 11:40:09 +0100
commitb0276dfd74472df67c8e9d521d61fab4e47d26ad (patch)
tree178ffaacdbde37976bda6c45332a756077a31da9 /src
parent2e03692f5b65231c6537a37fcb25652de5cc91e2 (diff)
fix(feat): `disable_automatic_asset_installation` (#1226)
* fix(feat): `disable_automatic_asset_installation` This fixes a regression in the feature system: The asset installation didn't get turned off by the feature. Add error logging to the install functions. Properly show features in setup disable `mkdir` in `wasm_vm` on `feature-disable-asset-installation` Alternative: Is this even needed? We make sure the directory is there upon the normal asset installation. fixes #1130
Diffstat (limited to 'src')
-rw-r--r--src/commands.rs1
-rw-r--r--src/install.rs23
2 files changed, 18 insertions, 6 deletions
diff --git a/src/commands.rs b/src/commands.rs
index 542741343..cfbcb8f08 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -89,7 +89,6 @@ fn create_new_client() -> ClientInfo {
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);
}
diff --git a/src/install.rs b/src/install.rs
index e7778dde2..047c23707 100644
--- a/src/install.rs
+++ b/src/install.rs
@@ -1,7 +1,10 @@
+#[cfg(not(feature = "disable_automatic_asset_installation"))]
use std::fs;
use std::path::Path;
+#[cfg(not(feature = "disable_automatic_asset_installation"))]
use zellij_utils::{consts::VERSION, shared::set_permissions};
+#[cfg(not(feature = "disable_automatic_asset_installation"))]
macro_rules! asset_map {
($($src:literal => $dst:literal),+ $(,)?) => {
{
@@ -14,6 +17,7 @@ macro_rules! asset_map {
}
}
+#[cfg(not(feature = "disable_automatic_asset_installation"))]
pub(crate) fn populate_data_dir(data_dir: &Path) {
// First run installation of default plugins & layouts
let mut assets = asset_map! {
@@ -28,11 +32,20 @@ pub(crate) fn populate_data_dir(data_dir: &Path) {
for (path, bytes) in assets {
let path = data_dir.join(path);
- let parent_path = path.parent().unwrap();
- fs::create_dir_all(parent_path).unwrap();
- set_permissions(parent_path).unwrap();
- if out_of_date || !path.exists() {
- fs::write(path, bytes).expect("Failed to install default assets!");
+ // TODO: Is the [path.parent()] really necessary here?
+ // We already have the path and the parent through `data_dir`
+ if let Some(parent_path) = path.parent() {
+ fs::create_dir_all(parent_path).unwrap_or_else(|e| log::error!("{:?}", e));
+ set_permissions(parent_path).unwrap_or_else(|e| log::error!("{:?}", e));
+ if out_of_date || !path.exists() {
+ fs::write(path, bytes)
+ .unwrap_or_else(|e| log::error!("Failed to install default assets! {:?}", e));
+ }
+ } else {
+ log::error!("The path {:?} has no parent directory", path);
}
}
}
+
+#[cfg(feature = "disable_automatic_asset_installation")]
+pub(crate) fn populate_data_dir(_data_dir: &Path) {}