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

allow pkexec to be used instead of sudo (#201)

Browse Source 
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
This commit is contained in:
Marc-Antoine Perennou
2019-08-20 14:02:13 +02:00
committed by Roey Darwish Dror
parent f5c2368a4d
commit fda52486b3
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.rs
View File

@@ -89,7 +89,7 @@ fn run() -> Result<(), Error> {
let mut report = Report::new(); let mut report = Report::new();
#[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "linux"))] #[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "linux"))]
let sudo = utils::which("sudo"); let sudo = utils::sudo();
let run_type = executor::RunType::new(config.dry_run()); let run_type = executor::RunType::new(config.dry_run());
#[cfg(feature = "self-update")] #[cfg(feature = "self-update")]

5
src/utils.rs
View File

@@ -80,6 +80,11 @@ pub fn which<T: AsRef<OsStr> + Debug>(binary_name: T) -> Option<PathBuf> {
} }
} }
#[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "linux"))]
pub fn sudo() -> Option<PathBuf> {
which("sudo").or_else(|| which("pkexec"))
}
/// `std::fmt::Display` implementation for `std::path::Path`. /// `std::fmt::Display` implementation for `std::path::Path`.
/// ///
/// This struct differs from `std::path::Display` in that in Windows it takes care of printing backslashes /// This struct differs from `std::path::Display` in that in Windows it takes care of printing backslashes