mirror of
https://github.com/nushell/nushell.git
synced 2024-11-24 17:34:00 +01:00
<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> Fixes #12416. Turns out that in src/main.rs, `XDG_CONFIG_HOME` wasn't being canonicalized before being compared to `nu_path::config_dir()` to check if `XDG_CONFIG_HOME` was set to an invalid value. This has been rectified now. # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> Setting `XDG_CONFIG_HOME` to a symlink should work now. # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> I manually tested it and the error has disappeared: New behavior (this branch): ![image](https://github.com/nushell/nushell/assets/45539777/062d1cc5-551c-431c-b138-d3da8de018bd) Old behavior (main): ![image](https://github.com/nushell/nushell/assets/45539777/22c4b5a3-3fd0-4ab6-9cf0-ae25488645ba) Thanks to a pointer from Devyn, I've now added tests to make sure the `xdg_config_home_invalid` error doesn't pop up when `XDG_CONFIG_HOME` is a symlink (and does when it's actually invalid). Turns out two of the tests in `test_config_path` tried modifying `XDG_CONFIG_HOME` using `playground.with_env` but used `nu!`, so the subprocess didn't actually use the modified value of `XDG_CONFIG_HOME`. When I added them, I was unaware that the `.with_env` didn't actually modify the environment. This has now been rectified. # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
This commit is contained in:
parent
e211e96d33
commit
eb36dbb091
@ -25,6 +25,7 @@ use miette::Result;
|
||||
use nu_cli::gather_parent_env_vars;
|
||||
use nu_cmd_base::util::get_init_cwd;
|
||||
use nu_lsp::LanguageServer;
|
||||
use nu_path::canonicalize_with;
|
||||
use nu_protocol::{
|
||||
engine::EngineState, eval_const::create_nu_constant, report_error_new, util::BufferedReader,
|
||||
PipelineData, RawStream, ShellError, Span, Value, NU_VARIABLE_ID,
|
||||
@ -35,7 +36,7 @@ use run::{run_commands, run_file, run_repl};
|
||||
use signals::ctrlc_protection;
|
||||
use std::{
|
||||
io::BufReader,
|
||||
path::Path,
|
||||
path::PathBuf,
|
||||
str::FromStr,
|
||||
sync::{atomic::AtomicBool, Arc},
|
||||
};
|
||||
@ -94,7 +95,11 @@ fn main() -> Result<()> {
|
||||
|
||||
if let Ok(xdg_config_home) = std::env::var("XDG_CONFIG_HOME") {
|
||||
if !xdg_config_home.is_empty() {
|
||||
if nushell_config_path != Path::new(&xdg_config_home).join("nushell") {
|
||||
if nushell_config_path
|
||||
!= canonicalize_with(&xdg_config_home, &init_cwd)
|
||||
.unwrap_or(PathBuf::from(&xdg_config_home))
|
||||
.join("nushell")
|
||||
{
|
||||
report_error_new(
|
||||
&engine_state,
|
||||
&ShellError::InvalidXdgConfig {
|
||||
|
@ -62,6 +62,23 @@ fn run(playground: &mut Playground, command: &str) -> String {
|
||||
.to_string()
|
||||
}
|
||||
|
||||
#[cfg(not(windows))]
|
||||
fn run_interactive_stderr(xdg_config_home: impl AsRef<Path>) -> String {
|
||||
let child_output = std::process::Command::new("sh")
|
||||
.arg("-c")
|
||||
.arg(format!(
|
||||
"{:?} -i -c 'echo $nu.is-interactive'",
|
||||
nu_test_support::fs::executable_path()
|
||||
))
|
||||
.env("XDG_CONFIG_HOME", adjust_canonicalization(xdg_config_home))
|
||||
.output()
|
||||
.expect("Should have outputted");
|
||||
|
||||
return String::from_utf8_lossy(&child_output.stderr)
|
||||
.trim()
|
||||
.to_string();
|
||||
}
|
||||
|
||||
fn test_config_path_helper(playground: &mut Playground, config_dir_nushell: PathBuf) {
|
||||
// Create the config dir folder structure if it does not already exist
|
||||
if !config_dir_nushell.exists() {
|
||||
@ -217,10 +234,10 @@ fn test_xdg_config_empty() {
|
||||
Playground::setup("xdg_config_empty", |_, playground| {
|
||||
playground.with_env("XDG_CONFIG_HOME", "");
|
||||
|
||||
let actual = nu!("$nu.default-config-dir");
|
||||
let actual = run(playground, "$nu.default-config-dir");
|
||||
let expected = dirs_next::config_dir().unwrap().join("nushell");
|
||||
assert_eq!(
|
||||
actual.out,
|
||||
actual,
|
||||
adjust_canonicalization(expected.canonicalize().unwrap_or(expected))
|
||||
);
|
||||
});
|
||||
@ -229,13 +246,38 @@ fn test_xdg_config_empty() {
|
||||
#[test]
|
||||
fn test_xdg_config_bad() {
|
||||
Playground::setup("xdg_config_bad", |_, playground| {
|
||||
playground.with_env("XDG_CONFIG_HOME", r#"mn2''6t\/k*((*&^//k//: "#);
|
||||
let xdg_config_home = r#"mn2''6t\/k*((*&^//k//: "#;
|
||||
playground.with_env("XDG_CONFIG_HOME", xdg_config_home);
|
||||
|
||||
let actual = nu!("$nu.default-config-dir");
|
||||
let actual = run(playground, "$nu.default-config-dir");
|
||||
let expected = dirs_next::config_dir().unwrap().join("nushell");
|
||||
assert_eq!(
|
||||
actual.out,
|
||||
actual,
|
||||
adjust_canonicalization(expected.canonicalize().unwrap_or(expected))
|
||||
);
|
||||
|
||||
#[cfg(not(windows))]
|
||||
{
|
||||
let stderr = run_interactive_stderr(xdg_config_home);
|
||||
assert!(
|
||||
stderr.contains("xdg_config_home_invalid"),
|
||||
"stderr was {}",
|
||||
stderr
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// Shouldn't complain if XDG_CONFIG_HOME is a symlink
|
||||
#[test]
|
||||
#[cfg(not(windows))]
|
||||
fn test_xdg_config_symlink() {
|
||||
Playground::setup("xdg_config_symlink", |_, playground| {
|
||||
let config_link = "config_link";
|
||||
|
||||
playground.symlink("real", config_link);
|
||||
|
||||
let stderr = run_interactive_stderr(playground.cwd().join(config_link));
|
||||
assert!(stderr.is_empty(), "stderr was {}", stderr);
|
||||
});
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user