mirror of
https://github.com/nushell/nushell.git
synced 2024-11-30 20:34:16 +01:00
Update SHLVL (only when interactive) on startup (#14404)
<!-- 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. --> Make NuShell correctly inherit and update `SHLVL` from other shells (obviously including itself) in Unix environment. See issue #14384 # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> None # 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 toolkit.nu; toolkit test stdlib"` 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 > ``` --> New code formatted. New feature works well in interactive usage. # 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
e63976df7e
commit
2a90cb7355
10
src/main.rs
10
src/main.rs
@ -280,6 +280,16 @@ fn main() -> Result<()> {
|
|||||||
Value::string(env!("CARGO_PKG_VERSION"), Span::unknown()),
|
Value::string(env!("CARGO_PKG_VERSION"), Span::unknown()),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Add SHLVL if interactive
|
||||||
|
if engine_state.is_interactive {
|
||||||
|
let mut shlvl = engine_state
|
||||||
|
.get_env_var("SHLVL")
|
||||||
|
.map(|x| x.as_str().unwrap_or("0").parse::<i64>().unwrap_or(0))
|
||||||
|
.unwrap_or(0);
|
||||||
|
shlvl += 1;
|
||||||
|
engine_state.add_env_var("SHLVL".to_string(), Value::int(shlvl, Span::unknown()));
|
||||||
|
}
|
||||||
|
|
||||||
if parsed_nu_cli_args.no_std_lib.is_none() {
|
if parsed_nu_cli_args.no_std_lib.is_none() {
|
||||||
load_standard_library(&mut engine_state)?;
|
load_standard_library(&mut engine_state)?;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user