From a427a9d2f2f90d651b046ea439d4626935372b89 Mon Sep 17 00:00:00 2001 From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com> Date: Wed, 14 Sep 2022 05:50:34 -0400 Subject: [PATCH] other: add zfs to deploy feature set (#808) --- Cargo.lock | 4 ++-- Cargo.toml | 22 ++++++++-------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 12745410..dfd2e0bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1536,9 +1536,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.23.10" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eea2ed6847da2e0c7289f72cb4f285f0bd704694ca067d32be811b2a45ea858" +checksum = "3977ec2e0520829be45c8a2df70db2bf364714d8a748316a10c3c35d4d2b01c9" dependencies = [ "cfg-if", "core-foundation-sys 0.8.3", diff --git a/Cargo.toml b/Cargo.toml index aa678453..e223528d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,13 +41,17 @@ opt-level = 3 codegen-units = 1 [features] -default = ["fern", "log", "battery", "gpu", "zfs"] battery = ["starship-battery"] -deploy = ["battery", "gpu"] gpu = ["nvidia"] nvidia = ["nvml-wrapper"] zfs = ["sysctl"] +# The features we use by default. +default = ["fern", "log", "battery", "gpu", "zfs"] + +# The features we use on deploy. Logging is not included as that is primarily (for now) just for debugging locally. +deploy = ["battery", "gpu", "zfs"] + [dependencies] anyhow = "1.0.57" backtrace = "0.3.65" @@ -56,7 +60,6 @@ clap = { version = "3.1.12", features = ["default", "cargo", "wrap_help"] } concat-string = "1.0.1" crossterm = "0.18.2" ctrlc = { version = "3.1.9", features = ["termination"] } -# const_format = "0.2.23" dirs = "4.0.0" fern = { version = "0.6.1", optional = true } @@ -113,11 +116,7 @@ section = "utility" assets = [ ["target/release/btm", "usr/bin/", "755"], ["LICENSE", "usr/share/doc/btm/", "644"], - [ - "manpage/btm.1.gz", - "usr/share/man/man1/btm.1.gz", - "644", - ], + ["manpage/btm.1.gz", "usr/share/man/man1/btm.1.gz", "644"], [ "completion/btm.bash", "usr/share/bash-completion/completions/btm", @@ -128,11 +127,7 @@ assets = [ "usr/share/fish/vendor_completions.d/btm.fish", "644", ], - [ - "completion/_btm", - "usr/share/zsh/vendor-completions/", - "644", - ], + ["completion/_btm", "usr/share/zsh/vendor-completions/", "644"], ] extended-description = """\ A customizable cross-platform graphical process/system monitor for the terminal. Supports Linux, macOS, and Windows. @@ -155,4 +150,3 @@ output = "bottom_x86_64_installer.msi" version = "1" default-features = false features = ["user-hooks"] -