Better formatting
This commit is contained in:
parent
e08320f5ea
commit
be33b46f1d
@ -42,36 +42,32 @@ impl Config {
|
|||||||
match (prog.first(), &self.term) {
|
match (prog.first(), &self.term) {
|
||||||
(None, &None) => {
|
(None, &None) => {
|
||||||
let mut child = Command::new(&command).spawn().expect(
|
let mut child = Command::new(&command).spawn().expect(
|
||||||
"Failed to open package manager"
|
"Failed to open package manager",
|
||||||
);
|
);
|
||||||
child.wait().expect("Failed to wait on package manager");
|
child.wait().expect("Failed to wait on package manager");
|
||||||
},
|
}
|
||||||
(None, &Some(ref term)) => {
|
(None, &Some(ref term)) => {
|
||||||
let mut child = Command::new(&command)
|
let mut child = Command::new(&command).arg(term).spawn().expect(
|
||||||
.arg(term)
|
"Failed to open package manager",
|
||||||
.spawn()
|
);
|
||||||
.expect("Failed to open package manager");
|
|
||||||
child.wait().expect("Failed to wait on package manager");
|
child.wait().expect("Failed to wait on package manager");
|
||||||
},
|
}
|
||||||
(Some(_), &None) => {
|
(Some(_), &None) => {
|
||||||
for arg in &prog {
|
for arg in &prog {
|
||||||
let mut child =Command::new(&command)
|
let mut child = Command::new(&command).arg(arg).spawn().expect(
|
||||||
.arg(arg)
|
"Failed to open package manager",
|
||||||
.spawn()
|
);
|
||||||
.expect("Failed to open package manager");
|
|
||||||
child.wait().expect("Failed to wait on child");
|
child.wait().expect("Failed to wait on child");
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
(Some(_), &Some(ref term)) => {
|
(Some(_), &Some(ref term)) => {
|
||||||
for arg in &prog {
|
for arg in &prog {
|
||||||
let mut child = Command::new(&command)
|
let mut child = Command::new(&command).arg(arg).arg(term).spawn().expect(
|
||||||
.arg(arg)
|
"Failed to open package manager",
|
||||||
.arg(term)
|
);
|
||||||
.spawn()
|
|
||||||
.expect("Failed to open package manager");
|
|
||||||
child.wait().expect("Failed to wait on child");
|
child.wait().expect("Failed to wait on child");
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// Creates a `Config` from passed arguments, parses the `Management` enum
|
/// Creates a `Config` from passed arguments, parses the `Management` enum
|
||||||
|
@ -23,9 +23,7 @@ fn main() {
|
|||||||
let config = Config::new();
|
let config = Config::new();
|
||||||
|
|
||||||
//Sets a path to `~/.config/rux/`
|
//Sets a path to `~/.config/rux/`
|
||||||
let mut ruxconf = std::env::home_dir().unwrap_or_else(|| {
|
let mut ruxconf = std::env::home_dir().unwrap_or_else(|| PathBuf::new());
|
||||||
PathBuf::new()
|
|
||||||
});
|
|
||||||
ruxconf.push(".config/rux/rux.conf");
|
ruxconf.push(".config/rux/rux.conf");
|
||||||
|
|
||||||
// Checks if `~/.config/rux/rux.conf` exists and skips loading any
|
// Checks if `~/.config/rux/rux.conf` exists and skips loading any
|
||||||
@ -63,10 +61,7 @@ fn main() {
|
|||||||
println!("Would you like to set {} as default? [y/N]", prog.name);
|
println!("Would you like to set {} as default? [y/N]", prog.name);
|
||||||
if input().unwrap().trim().to_lowercase() == "y" {
|
if input().unwrap().trim().to_lowercase() == "y" {
|
||||||
prog.set_default().unwrap_or_else(|err| {
|
prog.set_default().unwrap_or_else(|err| {
|
||||||
println!(
|
println!("An error occurred trying to set default {:?}", err.kind())
|
||||||
"An error occurred trying to set default {:?}",
|
|
||||||
err.kind()
|
|
||||||
)
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
config.run(prog);
|
config.run(prog);
|
||||||
|
@ -97,7 +97,7 @@ impl<'a> PackageManager<'a> {
|
|||||||
let conf = conf.join(".config").join("rux");
|
let conf = conf.join(".config").join("rux");
|
||||||
fs::create_dir_all(&conf).unwrap_or_else(|err| {
|
fs::create_dir_all(&conf).unwrap_or_else(|err| {
|
||||||
println!("Error setting default: {}", err);
|
println!("Error setting default: {}", err);
|
||||||
return ()
|
return ();
|
||||||
});
|
});
|
||||||
let conf = conf.join("rux.conf");
|
let conf = conf.join("rux.conf");
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user