mirror of
https://github.com/nushell/nushell.git
synced 2024-11-23 00:43:33 +01:00
fix 0.66 nu-command crate (#6138)
This commit is contained in:
parent
c6cb491e77
commit
2b7c811402
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -2554,7 +2554,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nu-command"
|
name = "nu-command"
|
||||||
version = "0.66.0"
|
version = "0.66.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"Inflector",
|
"Inflector",
|
||||||
"alphanumeric-sort",
|
"alphanumeric-sort",
|
||||||
|
@ -41,7 +41,7 @@ miette = "5.1.0"
|
|||||||
nu-ansi-term = "0.46.0"
|
nu-ansi-term = "0.46.0"
|
||||||
nu-cli = { path="./crates/nu-cli", version = "0.66.0" }
|
nu-cli = { path="./crates/nu-cli", version = "0.66.0" }
|
||||||
nu-color-config = { path = "./crates/nu-color-config", version = "0.66.0" }
|
nu-color-config = { path = "./crates/nu-color-config", version = "0.66.0" }
|
||||||
nu-command = { path="./crates/nu-command", version = "0.66.0" }
|
nu-command = { path="./crates/nu-command", version = "0.66.1" }
|
||||||
nu-engine = { path="./crates/nu-engine", version = "0.66.0" }
|
nu-engine = { path="./crates/nu-engine", version = "0.66.0" }
|
||||||
nu-json = { path="./crates/nu-json", version = "0.66.0" }
|
nu-json = { path="./crates/nu-json", version = "0.66.0" }
|
||||||
nu-parser = { path="./crates/nu-parser", version = "0.66.0" }
|
nu-parser = { path="./crates/nu-parser", version = "0.66.0" }
|
||||||
|
@ -4,7 +4,7 @@ description = "Nushell's built-in commands"
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
name = "nu-command"
|
name = "nu-command"
|
||||||
version = "0.66.0"
|
version = "0.66.1"
|
||||||
build = "build.rs"
|
build = "build.rs"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
@ -342,7 +342,6 @@ pub fn create_default_context() -> EngineState {
|
|||||||
WithEnv,
|
WithEnv,
|
||||||
ConfigNu,
|
ConfigNu,
|
||||||
ConfigEnv,
|
ConfigEnv,
|
||||||
ConfigReset,
|
|
||||||
ConfigMeta,
|
ConfigMeta,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
112
crates/nu-command/src/env/config/config_reset.rs
vendored
112
crates/nu-command/src/env/config/config_reset.rs
vendored
@ -1,112 +0,0 @@
|
|||||||
use chrono::Local;
|
|
||||||
use nu_protocol::{
|
|
||||||
ast::Call,
|
|
||||||
engine::{Command, EngineState, Stack},
|
|
||||||
Category, Example, PipelineData, ShellError, Signature,
|
|
||||||
};
|
|
||||||
use std::io::Write;
|
|
||||||
|
|
||||||
#[derive(Clone)]
|
|
||||||
pub struct ConfigReset;
|
|
||||||
|
|
||||||
impl Command for ConfigReset {
|
|
||||||
fn name(&self) -> &str {
|
|
||||||
"config reset"
|
|
||||||
}
|
|
||||||
|
|
||||||
fn signature(&self) -> Signature {
|
|
||||||
Signature::build(self.name())
|
|
||||||
.switch("nu", "reset only nu config, config.nu", Some('n'))
|
|
||||||
.switch("env", "reset only env config, env.nu", Some('e'))
|
|
||||||
.switch("without-backup", "do not make a backup", Some('w'))
|
|
||||||
.category(Category::Env)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn usage(&self) -> &str {
|
|
||||||
"Reset nushell environment configurations to default, and saves old config files in the config location as oldconfig.nu and oldenv.nu"
|
|
||||||
}
|
|
||||||
|
|
||||||
fn examples(&self) -> Vec<Example> {
|
|
||||||
vec![Example {
|
|
||||||
description: "reset nushell configuration files",
|
|
||||||
example: "config reset",
|
|
||||||
result: None,
|
|
||||||
}]
|
|
||||||
}
|
|
||||||
|
|
||||||
fn run(
|
|
||||||
&self,
|
|
||||||
_engine_state: &EngineState,
|
|
||||||
_stack: &mut Stack,
|
|
||||||
call: &Call,
|
|
||||||
_input: PipelineData,
|
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
|
||||||
let only_nu = call.has_flag("nu");
|
|
||||||
let only_env = call.has_flag("env");
|
|
||||||
let no_backup = call.has_flag("without-backup");
|
|
||||||
let span = call.head;
|
|
||||||
let mut config_path = match nu_path::config_dir() {
|
|
||||||
Some(path) => path,
|
|
||||||
None => {
|
|
||||||
return Err(ShellError::GenericError(
|
|
||||||
"Could not find config path".to_string(),
|
|
||||||
"Could not find config path".to_string(),
|
|
||||||
None,
|
|
||||||
None,
|
|
||||||
Vec::new(),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
config_path.push("nushell");
|
|
||||||
if !only_env {
|
|
||||||
let mut nu_config = config_path.clone();
|
|
||||||
nu_config.push("config.nu");
|
|
||||||
let config_file = include_str!("../../../../../docs/sample_config/default_config.nu");
|
|
||||||
if !no_backup {
|
|
||||||
let mut backup_path = config_path.clone();
|
|
||||||
backup_path.push(format!(
|
|
||||||
"oldconfig-{}.nu",
|
|
||||||
Local::now().format("%F-%H-%M-%S"),
|
|
||||||
));
|
|
||||||
if std::fs::rename(nu_config.clone(), backup_path).is_err() {
|
|
||||||
return Err(ShellError::FileNotFoundCustom(
|
|
||||||
"config.nu could not be backed up".into(),
|
|
||||||
span,
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if let Ok(mut file) = std::fs::File::create(nu_config) {
|
|
||||||
if writeln!(&mut file, "{}", config_file).is_err() {
|
|
||||||
return Err(ShellError::FileNotFoundCustom(
|
|
||||||
"config.nu could not be written to".into(),
|
|
||||||
span,
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !only_nu {
|
|
||||||
let mut env_config = config_path.clone();
|
|
||||||
env_config.push("env.nu");
|
|
||||||
let config_file = include_str!("../../../../../docs/sample_config/default_env.nu");
|
|
||||||
if !no_backup {
|
|
||||||
let mut backup_path = config_path.clone();
|
|
||||||
backup_path.push(format!("oldenv-{}.nu", Local::now().format("%F-%H-%M-%S"),));
|
|
||||||
if std::fs::rename(env_config.clone(), backup_path).is_err() {
|
|
||||||
return Err(ShellError::FileNotFoundCustom(
|
|
||||||
"env.nu could not be backed up".into(),
|
|
||||||
span,
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if let Ok(mut file) = std::fs::File::create(env_config) {
|
|
||||||
if writeln!(&mut file, "{}", config_file).is_err() {
|
|
||||||
return Err(ShellError::FileNotFoundCustom(
|
|
||||||
"env.nu could not be written to".into(),
|
|
||||||
span,
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(PipelineData::new(span))
|
|
||||||
}
|
|
||||||
}
|
|
2
crates/nu-command/src/env/config/mod.rs
vendored
2
crates/nu-command/src/env/config/mod.rs
vendored
@ -1,9 +1,7 @@
|
|||||||
mod config_;
|
mod config_;
|
||||||
mod config_env;
|
mod config_env;
|
||||||
mod config_nu;
|
mod config_nu;
|
||||||
mod config_reset;
|
|
||||||
mod utils;
|
mod utils;
|
||||||
pub use config_::ConfigMeta;
|
pub use config_::ConfigMeta;
|
||||||
pub use config_env::ConfigEnv;
|
pub use config_env::ConfigEnv;
|
||||||
pub use config_nu::ConfigNu;
|
pub use config_nu::ConfigNu;
|
||||||
pub use config_reset::ConfigReset;
|
|
||||||
|
1
crates/nu-command/src/env/mod.rs
vendored
1
crates/nu-command/src/env/mod.rs
vendored
@ -7,7 +7,6 @@ mod with_env;
|
|||||||
pub use config::ConfigEnv;
|
pub use config::ConfigEnv;
|
||||||
pub use config::ConfigMeta;
|
pub use config::ConfigMeta;
|
||||||
pub use config::ConfigNu;
|
pub use config::ConfigNu;
|
||||||
pub use config::ConfigReset;
|
|
||||||
pub use env_command::Env;
|
pub use env_command::Env;
|
||||||
pub use let_env::LetEnv;
|
pub use let_env::LetEnv;
|
||||||
pub use load_env::LoadEnv;
|
pub use load_env::LoadEnv;
|
||||||
|
Loading…
Reference in New Issue
Block a user