From 4f61a12013932dbf4d498f3f852eb6bcb1ab19f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Wei=C3=9Fmann?= Date: Wed, 15 May 2019 12:08:15 +0200 Subject: [PATCH] Adds support for pihole update manager (#151) --- README.md | 1 + src/main.rs | 6 ++++++ src/steps/os/linux.rs | 10 ++++++++++ 3 files changed, 17 insertions(+) diff --git a/README.md b/README.md index 684c1b6d..0df3704e 100644 --- a/README.md +++ b/README.md @@ -104,6 +104,7 @@ Just run `topgrade`. It will run the following steps: * **Linux**: Run [fwupdmgr](https://github.com/hughsie/fwupd) to show firmware upgrade. (View only. No upgrades will actually be performed) * **Linux**: Run `rpi-update` to update Raspberry Pi Firmware +* **Linux**: Run [pihole](https://pi-hole.net/) updater * Run custom defined commands * Final stage * **Linux**: Run [needrestart](https://github.com/liske/needrestart) diff --git a/src/main.rs b/src/main.rs index 513a5d4c..5cfc9d91 100644 --- a/src/main.rs +++ b/src/main.rs @@ -372,6 +372,12 @@ fn run() -> Result<(), Error> { #[cfg(target_os = "linux")] { + execute( + &mut report, + "pihole", + || linux::run_pihole_update(sudo.as_ref(), run_type), + config.no_retry(), + )?; execute( &mut report, "rpi-update", diff --git a/src/steps/os/linux.rs b/src/steps/os/linux.rs index 3f75b1da..b2144036 100644 --- a/src/steps/os/linux.rs +++ b/src/steps/os/linux.rs @@ -310,6 +310,16 @@ pub fn run_rpi_update(sudo: Option<&PathBuf>, run_type: RunType) -> Result<(), E run_type.execute(sudo).arg(rpi_update).check_run() } +#[must_use] +pub fn run_pihole_update(sudo: Option<&PathBuf>, run_type: RunType) -> Result<(), Error> { + let sudo = require_option(sudo)?; + let pihole = require("pihole")?; + + print_separator("pihole"); + + run_type.execute(sudo).arg(pihole).arg("-up").check_run() +} + #[must_use] pub fn run_etc_update(sudo: Option<&PathBuf>, run_type: RunType) -> Result<(), Error> { let sudo = require_option(sudo)?;