From fb5ff6f9c9089c8be101e90e6dd51089ed748c8e Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Wed, 10 Mar 2021 08:41:22 -0800
Subject: [PATCH] Allow specifying alternative commands for privilege
 escalation

Fixes #16.
---
 src/command/apply_local.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/command/apply_local.rs b/src/command/apply_local.rs
index cd69123..52ba115 100644
--- a/src/command/apply_local.rs
+++ b/src/command/apply_local.rs
@@ -27,6 +27,12 @@ pub fn subcommand() -> App<'static, 'static> {
         .arg(Arg::with_name("sudo")
             .long("sudo")
             .help("Attempt to escalate privileges if not run as root"))
+        .arg(Arg::with_name("sudo-command")
+            .long("sudo-command")
+            .value_name("COMMAND")
+            .help("Command to use to escalate privileges")
+            .default_value("sudo")
+            .takes_value(true))
         .arg(Arg::with_name("verbose")
             .short("v")
             .long("verbose")
@@ -73,7 +79,9 @@ pub async fn run(_global_args: &ArgMatches<'_>, local_args: &ArgMatches<'_>) {
             }
 
             if local_args.is_present("sudo") {
-                escalate().await;
+                let sudo = local_args.value_of("sudo-command").unwrap();
+
+                escalate(sudo).await;
             } else {
                 log::warn!("Colmena was not started by root. This is probably not going to work.");
                 log::warn!("Hint: Add the --sudo flag.");
@@ -123,11 +131,11 @@ pub async fn run(_global_args: &ArgMatches<'_>, local_args: &ArgMatches<'_>) {
     deployment.execute().await;
 }
 
-async fn escalate() -> ! {
+async fn escalate(sudo: &str) -> ! {
     // Restart ourselves with sudo
     let argv: Vec<String> = env::args().collect();
 
-    let exit = Command::new("sudo")
+    let exit = Command::new(sudo)
         .arg("--")
         .args(argv)
         .arg("--we-are-launched-by-sudo")