technofab/pay-respects
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/pay-respects.git synced 2025-12-12 06:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: extract inline environment variables

Browse source
This commit is contained in:
iff 2025-04-06 16:34:13 +02:00
parent 69a05ef574
commit f452f7196f
3 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
core/src/shell.rs
View file

@ -43,6 +43,7 @@ impl Init {
pub struct Data {
pub shell: String,
pub env: Option<String>,
pub command: String,
pub suggest: Option<String>,
pub candidates: Vec<String>,
@ -151,6 +152,7 @@ impl Data {
let mut init = Data {
shell,
env: None,
command,
suggest: None,
candidates: vec![],
@ -165,6 +167,7 @@ impl Data {
};
init.split();
init.extract_env();
init.expand_command();
if init.mode != Mode::Cnf {
init.update_error(None);
@ -174,6 +177,7 @@ impl Data {
{
eprintln!("/// data initialization");
eprintln!("shell: {}", init.shell);
eprintln!("env: {:?}", init.env);
eprintln!("command: {}", init.command);
eprintln!("error: {}", init.error);
eprintln!("modules: {:?}", init.modules);
@ -218,6 +222,21 @@ impl Data {
self.split = split;
}
pub fn extract_env(&mut self) {
let mut envs = vec![];
loop {
if self.split[0][1..].contains("=") {
envs.push(self.split.remove(0));
} else {
break;
}
}
if !envs.is_empty() {
self.env = Some(envs.join(" "));
self.command = self.split.join(" ");
}
}
pub fn update_error(&mut self, error: Option<String>) {
if let Some(error) = error {
self.error = error