mollusk/rux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better formatting

Browse Source
This commit is contained in:
Beefki 2017-11-07 21:27:32 -06:00
parent 9542d122b5
commit a92f51e20a
3 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/config.rs
View File

@ -42,36 +42,32 @@ impl Config {
match (prog.first(), &self.term) {
(None, &None) => {
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");
},
}
(None, &Some(ref term)) => {
let mut child = Command::new(&command)
.arg(term)
.spawn()
.expect("Failed to open package manager");
let mut child = Command::new(&command).arg(term).spawn().expect(
"Failed to open package manager",
);
child.wait().expect("Failed to wait on package manager");
},
}
(Some(_), &None) => {
for arg in &prog {
let mut child =Command::new(&command)
.arg(arg)
.spawn()
.expect("Failed to open package manager");
let mut child = Command::new(&command).arg(arg).spawn().expect(
"Failed to open package manager",
);
child.wait().expect("Failed to wait on child");
}
},
}
(Some(_), &Some(ref term)) => {
for arg in &prog {
let mut child = Command::new(&command)
.arg(arg)
.arg(term)
.spawn()
.expect("Failed to open package manager");
let mut child = Command::new(&command).arg(arg).arg(term).spawn().expect(
"Failed to open package manager",
);
child.wait().expect("Failed to wait on child");
}
},
}
}
}
/// Creates a `Config` from passed arguments, parses the `Management` enum

9
src/main.rs
View File

@ -23,9 +23,7 @@ fn main() {
let config = Config::new();
//Sets a path to `~/.config/rux/`
let mut ruxconf = std::env::home_dir().unwrap_or_else(|| {
PathBuf::new()
});
let mut ruxconf = std::env::home_dir().unwrap_or_else(|| PathBuf::new());
ruxconf.push(".config/rux/rux.conf");
// 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);
if input().unwrap().trim().to_lowercase() == "y" {
prog.set_default().unwrap_or_else(|err| {
println!(
"An error occurred trying to set default {:?}",
err.kind()
)
println!("An error occurred trying to set default {:?}", err.kind())
});
}
config.run(prog);

2
src/packagemanager.rs
View File

@ -97,7 +97,7 @@ impl<'a> PackageManager<'a> {
let conf = conf.join(".config").join("rux");
fs::create_dir_all(&conf).unwrap_or_else(|err| {
println!("Error setting default: {}", err);
return ()
return ();
});
let conf = conf.join("rux.conf");