admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use cross-platform terminal handling (#34)

Browse Source
This commit is contained in:
Roey Darwish Dror
2018-06-27 22:19:36 +03:00
parent fffaa36b55
commit 33a2b5d84c
5 changed files with 95 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/linux.rs
View File

@@ -52,7 +52,7 @@ impl Distribution {
pub fn upgrade_arch_linux(
sudo: &Option<PathBuf>,
terminal: &Terminal,
terminal: &mut Terminal,
) -> Result<(), failure::Error> {
if let Some(yay) = which("yay") {
if let Some(python) = which("python") {
@@ -82,7 +82,10 @@ It's dangerous to run yay since Python based AUR packages will be installed in t
Ok(())
}
pub fn upgrade_redhat(sudo: &Option<PathBuf>, terminal: &Terminal) -> Result<(), failure::Error> {
pub fn upgrade_redhat(
sudo: &Option<PathBuf>,
terminal: &mut Terminal,
) -> Result<(), failure::Error> {
if let Some(sudo) = &sudo {
Command::new(&sudo)
.args(&["yum", "upgrade"])
@@ -96,7 +99,10 @@ pub fn upgrade_redhat(sudo: &Option<PathBuf>, terminal: &Terminal) -> Result<(),
Ok(())
}
pub fn upgrade_fedora(sudo: &Option<PathBuf>, terminal: &Terminal) -> Result<(), failure::Error> {
pub fn upgrade_fedora(
sudo: &Option<PathBuf>,
terminal: &mut Terminal,
) -> Result<(), failure::Error> {
if let Some(sudo) = &sudo {
Command::new(&sudo)
.args(&["dnf", "upgrade"])
@@ -110,7 +116,10 @@ pub fn upgrade_fedora(sudo: &Option<PathBuf>, terminal: &Terminal) -> Result<(),
Ok(())
}
pub fn upgrade_debian(sudo: &Option<PathBuf>, terminal: &Terminal) -> Result<(), failure::Error> {
pub fn upgrade_debian(
sudo: &Option<PathBuf>,
terminal: &mut Terminal,
) -> Result<(), failure::Error> {
if let Some(sudo) = &sudo {
Command::new(&sudo)
.args(&["apt", "update"])