Ask user’s consent before executing a command
This commit is contained in:
parent
448430b749
commit
118640ec1c
@ -3,6 +3,7 @@ use enumset::EnumSetType;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::HashMap;
|
||||
use std::fmt;
|
||||
use std::io::{stdout, Write};
|
||||
use std::path::PathBuf;
|
||||
use std::process::Command;
|
||||
|
||||
@ -55,7 +56,6 @@ impl Updater {
|
||||
/// To create a sample config from code
|
||||
#[doc(hidden)]
|
||||
fn write_config(&self, opt: &Opt) {
|
||||
use ::std::io::Write;
|
||||
use std::fs::OpenOptions;
|
||||
|
||||
let mut f = OpenOptions::new()
|
||||
@ -157,13 +157,24 @@ impl Cmd {
|
||||
cmd.current_dir(std::fs::canonicalize(cdir).unwrap());
|
||||
}
|
||||
|
||||
println!("Executing {}", self);
|
||||
// TODO: Ask if ok or
|
||||
if cmd.status().unwrap().success() {
|
||||
println!("Youpi !");
|
||||
// Other checks?
|
||||
let confirm = "[Y/n]? ";
|
||||
|
||||
print!("Will execute {}{}", self, confirm);
|
||||
stdout().flush().unwrap();
|
||||
|
||||
let mut yes_no = String::new();
|
||||
std::io::stdin()
|
||||
.read_line(&mut yes_no)
|
||||
.expect("Unable to read user’s input");
|
||||
|
||||
if !yes_no.to_lowercase().starts_with('n') {
|
||||
if cmd.status().unwrap().success() {
|
||||
eprintln!("Youpi !");
|
||||
// Other checks?
|
||||
} else {
|
||||
eprintln!("Error executing the command")
|
||||
}
|
||||
}
|
||||
println!("Exécutée");
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@ -171,20 +182,22 @@ impl Cmd {
|
||||
|
||||
impl fmt::Display for Cmd {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
let command = if self.params.is_empty() {
|
||||
self.exe.clone()
|
||||
} else {
|
||||
let command = if !self.params.is_empty() {
|
||||
format!("{} {}", &self.exe, &self.params.join(" "))
|
||||
} else {
|
||||
self.exe.clone()
|
||||
};
|
||||
write!(f, "`{}`", command)?;
|
||||
|
||||
if let Some(cdir) = &self.current_dir {
|
||||
write!(f, " in {:?}", cdir)?;
|
||||
}
|
||||
|
||||
if !self.env.is_empty() {
|
||||
writeln!(f, " with the following environment variable:")?;
|
||||
writeln!(f, "{:?}", self.env)
|
||||
} else {
|
||||
writeln!(f, " without any environment variable.")
|
||||
write!(f, " without any environment variable. ")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user