leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix calls to rfkill on distros that put in in sbin

Browse source 
This makes the network applet work on Debian, for instance.

It may be better to directly use `/dev/rfkill`, but this improves things
for now.
This commit is contained in:
Ian Douglas Scott 2025-07-31 13:28:50 -07:00 • committed by Ian Douglas Scott
parent 19e750c65e
commit d3ef5b181b
2 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cosmic-applet-bluetooth/src/bluetooth.rs
View file

@ -72,6 +72,14 @@ fn device_type_to_icon(device_type: &str) -> &'static str {
}
}
// In some distros, rfkill is only in sbin, which isn't normally in PATH
// TODO: Directly access `/dev/rfkill`
fn rfkill_path_var() -> std::ffi::OsString {
let mut path = std::env::var_os("PATH").unwrap_or_default();
path.push(":/usr/sbin");
path
}
#[inline]
pub fn bluetooth_subscription<I: 'static + Hash + Copy + Send + Sync + Debug>(
id: I,
@ -682,6 +690,7 @@ impl BluerSessionState {
// rfkill will be persisted after reboot
let name = adapter_clone.name();
if let Some(id) = tokio::process::Command::new("rfkill")
.env("PATH", rfkill_path_var())
.arg("list")
.arg("-n")
.arg("--output")
@ -698,6 +707,7 @@ impl BluerSessionState {
})
{
if let Err(err) = tokio::process::Command::new("rfkill")
.env("PATH", rfkill_path_var())
.arg(if *enabled { "unblock" } else { "block" })
.arg(id)
.output()

10
cosmic-applet-network/src/network_manager/mod.rs
View file

@ -38,6 +38,14 @@ use self::{
current_networks::{active_connections, ActiveConnectionInfo},
};
// In some distros, rfkill is only in sbin, which isn't normally in PATH
// TODO: Directly access `/dev/rfkill`
fn rfkill_path_var() -> std::ffi::OsString {
let mut path = std::env::var_os("PATH").unwrap_or_default();
path.push(":/usr/sbin");
path
}
#[derive(Debug)]
pub enum State {
Ready,
@ -154,6 +162,7 @@ async fn start_listening(
// bluetooth
success = success
&& Command::new("rfkill")
.env("PATH", rfkill_path_var())
.arg(if airplane_mode { "block" } else { "unblock" })
.arg("bluetooth")
.output()
@ -402,6 +411,7 @@ impl NetworkManagerState {
let mut self_ = Self::default();
// airplane mode
let airplaine_mode = Command::new("rfkill")
.env("PATH", rfkill_path_var())
.arg("list")
.arg("bluetooth")
.output()