remove constraint to be run by root

Author: pythops

Cargo.lock

@@ -26,7 +26,6 @@ terminal-light = "1"
 anyhow = "1"
 iwdrs = "0.1"
 chrono = "0.4"
-libc = "0.2"
 
 [profile.release]
 strip = true

Cargo.toml

@@ -157,10 +157,7 @@ impl App {
         let session = {
             match iwdrs::session::Session::new().await {
                 Ok(session) => Arc::new(session),
-                Err(e) => {
-                    eprintln!("Can not access the iwd service: {}", e);
-                    exit(1);
-                }
+                Err(e) => return Err(anyhow!("Can not access the iwd service: {}", e).into()),
             }
         };
 

src/app.rs

@@ -13,11 +13,6 @@ use std::sync::Arc;
 
 #[tokio::main]
 async fn main() -> AppResult<()> {
-    if unsafe { libc::geteuid() } != 0 {
-        eprintln!("This program must be run as root");
-        std::process::exit(1);
-    }
-
     let args = cli::cli().get_matches();
 
     let config = Arc::new(Config::new());
@@ -35,7 +30,13 @@ async fn main() -> AppResult<()> {
 
     let mode = Mode::try_from(mode.as_str())?;
 
-    App::reset(mode.clone(), tui.events.sender.clone()).await?;
+    if App::reset(mode.clone(), tui.events.sender.clone())
+        .await
+        .is_err()
+    {
+        tui.exit()?;
+    }
+
     let mut app = App::new(help.clone(), mode, tui.events.sender.clone()).await?;
 
     while app.running {
@@ -55,7 +56,12 @@ async fn main() -> AppResult<()> {
                 app.notifications.push(notification);
             }
             Event::Reset(mode) => {
-                App::reset(mode.clone(), tui.events.sender.clone()).await?;
+                if App::reset(mode.clone(), tui.events.sender.clone())
+                    .await
+                    .is_err()
+                {
+                    tui.exit()?;
+                }
                 app = App::new(help.clone(), mode, tui.events.sender.clone()).await?;
             }
             _ => {}