holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make finding the path variable more robust (#3336)

Browse Source 
* Make finding the path variable more robust

* Update reload_config also
This commit is contained in:
JT 2021-04-21 11:37:10 +12:00 committed by GitHub
parent da81e21bf2
commit ce35689d2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crates/nu-engine/src/evaluation_context.rs
View File

@ -169,7 +169,17 @@ impl EvaluationContext {
let joined_paths = cfg_paths let joined_paths = cfg_paths
.map(|mut cfg_paths| { .map(|mut cfg_paths| {
//existing paths are prepended to path //existing paths are prepended to path
if let Some(env_paths) = self.scope.get_env("PATH") { let env_paths = if let Some(env_paths) = self.scope.get_env("PATH") {
Some(env_paths)
} else if let Some(env_paths) = self.scope.get_env("Path") {
Some(env_paths)
} else if let Some(env_paths) = self.scope.get_env("path") {
Some(env_paths)
} else {
None
};
if let Some(env_paths) = env_paths {
let mut env_paths = std::env::split_paths(&env_paths).collect::<Vec<_>>(); let mut env_paths = std::env::split_paths(&env_paths).collect::<Vec<_>>();
//No duplicates! Remove env_paths already existing in cfg_paths //No duplicates! Remove env_paths already existing in cfg_paths
env_paths.retain(|env_path| !cfg_paths.contains(env_path)); env_paths.retain(|env_path| !cfg_paths.contains(env_path));
@ -230,7 +240,17 @@ impl EvaluationContext {
let joined_paths = cfg_paths let joined_paths = cfg_paths
.map(|mut cfg_paths| { .map(|mut cfg_paths| {
//existing paths are prepended to path //existing paths are prepended to path
if let Some(env_paths) = self.scope.get_env("PATH") { let env_paths = if let Some(env_paths) = self.scope.get_env("PATH") {
Some(env_paths)
} else if let Some(env_paths) = self.scope.get_env("Path") {
Some(env_paths)
} else if let Some(env_paths) = self.scope.get_env("path") {
Some(env_paths)
} else {
None
};
if let Some(env_paths) = env_paths {
let mut env_paths = std::env::split_paths(&env_paths).collect::<Vec<_>>(); let mut env_paths = std::env::split_paths(&env_paths).collect::<Vec<_>>();
//No duplicates! Remove env_paths already existing in cfg_paths //No duplicates! Remove env_paths already existing in cfg_paths
env_paths.retain(|env_path| !cfg_paths.contains(env_path)); env_paths.retain(|env_path| !cfg_paths.contains(env_path));