zykino/system-updater
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not clear env when launching commands

Browse Source
This commit is contained in:
Zykino 2023-02-10 22:04:47 +01:00
parent 2332b75636
commit 83ac62b6df
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/command.rs
View File

@ -1,7 +1,7 @@
use crate::*; use crate::*;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::HashMap; use std::collections::HashMap;
use std::io::{stdout, Write}; use std::io::Write;
use std::path::PathBuf; use std::path::PathBuf;
use std::process::{Command, ExitStatus, Stdio}; use std::process::{Command, ExitStatus, Stdio};
use std::{fmt, fs, io}; use std::{fmt, fs, io};
@ -187,7 +187,7 @@ impl Updater {
updater.systems.push(sys); updater.systems.push(sys);
} }
eprintln!("{:#?}", updater); // eprintln!("{:#?}", updater);
Ok(updater) Ok(updater)
} }
@ -344,14 +344,13 @@ impl ActualCmd {
fn execute(&self, opt: &Opt) -> io::Result<ExitStatus> { fn execute(&self, opt: &Opt) -> io::Result<ExitStatus> {
let mut cmd = Command::new(&self.exe); let mut cmd = Command::new(&self.exe);
cmd.args(&self.params).env_clear().envs(&self.env); cmd.args(&self.params).envs(&self.env);
if let Some(cdir) = &self.current_dir { if let Some(cdir) = &self.current_dir {
cmd.current_dir(std::fs::canonicalize(cdir)?); cmd.current_dir(std::fs::canonicalize(cdir)?);
} }
print!("Executing: {}", self); print!("Executing: {}", self);
stdout().flush()?;
if opt.quiet { if opt.quiet {
// FIXME: stdin does not work with sudo? // FIXME: stdin does not work with sudo?