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

Fix broken env var reading on startup (#513)

Browse Source
This commit is contained in:
Jakub Žádník 2021-12-17 23:09:44 +02:00 committed by GitHub
parent 6f6340186a
commit ada9c742c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.rs
View File

@ -417,7 +417,9 @@ fn gather_parent_env_vars(engine_state: &mut EngineState, stack: &mut Stack) {
for (name, val) in std::env::vars() { for (name, val) in std::env::vars() {
fake_env_file.push_str(&name); fake_env_file.push_str(&name);
fake_env_file.push('='); fake_env_file.push('=');
fake_env_file.push('"');
fake_env_file.push_str(&val); fake_env_file.push_str(&val);
fake_env_file.push('"');
fake_env_file.push('\n'); fake_env_file.push('\n');
} }
@ -452,8 +454,12 @@ fn gather_parent_env_vars(engine_state: &mut EngineState, stack: &mut Stack) {
span, span,
}) = parts.get(2) }) = parts.get(2)
{ {
let bytes = engine_state.get_span_contents(span);
let bytes = bytes.strip_prefix(&[b'"']).unwrap_or(bytes);
let bytes = bytes.strip_suffix(&[b'"']).unwrap_or(bytes);
Value::String { Value::String {
val: String::from_utf8_lossy(engine_state.get_span_contents(span)).to_string(), val: String::from_utf8_lossy(bytes).to_string(),
span: *span, span: *span,
} }
} else { } else {