pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #512 from a-kenji/invert-asset-installation

Browse source 
Invert Assets Installation Feature
This commit is contained in:
a-kenji 2021-05-15 13:00:11 +02:00 • committed by GitHub
commit e0fede55a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Cargo.toml
View file

@ -80,5 +80,4 @@ assets = [
] ]
[features] [features]
default = [ "enable_automatic_asset_installation", ] disable_automatic_asset_installation = []
enable_automatic_asset_installation = []

4
src/common/utils/consts.rs
View file

@ -49,6 +49,6 @@ lazy_static! {
} }
pub const FEATURES: &[&str] = &[ pub const FEATURES: &[&str] = &[
#[cfg(feature = "enable_automatic_asset_installation")] #[cfg(feature = "disable_automatic_asset_installation")]
"enable_automatic_asset_installation", "disable_automatic_asset_installation",
]; ];

2
src/server/mod.rs
View file

@ -187,7 +187,7 @@ fn init_session(
// Determine and initialize the data directory // Determine and initialize the data directory
let data_dir = opts.data_dir.unwrap_or_else(get_default_data_dir); let data_dir = opts.data_dir.unwrap_or_else(get_default_data_dir);
#[cfg(enable_automatic_assets_installation)] #[cfg(not(disable_automatic_assets_installation))]
populate_data_dir(&data_dir); populate_data_dir(&data_dir);
// Don't use default layouts in tests, but do everywhere else // Don't use default layouts in tests, but do everywhere else