open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(cli): detect & prefer system-provided service

Browse Source 
Instead of always creating our own service file for the user, detect if
there is a service already present, and skip installing our own
service file.
This commit is contained in:
Sefa Eyeoglu 2022-03-25 19:16:13 +01:00
parent b2356abe69
commit 3b48a9ac9c
No known key found for this signature in database
GPG Key ID: C10411294912A422
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
espanso/src/cli/service/linux.rs
View File

@ -35,18 +35,23 @@ const LINUX_SERVICE_FILENAME: &str = formatcp!("{}.service", LINUX_SERVICE_NAME)
pub fn register() -> Result<()> { pub fn register() -> Result<()> {
let service_file = get_service_file_path()?; let service_file = get_service_file_path()?;
if service_file.exists() { if !service_file.exists() && is_present() {
warn_eprintln!("service file already exists, this operation will overwrite it"); // probably installed by system package
info_println!("skipping installation of already provided service");
} else {
if service_file.exists() {
warn_eprintln!("service file already exists, this operation will overwrite it");
}
info_println!("creating service file in {:?}", service_file);
let espanso_path = get_binary_path().expect("unable to get espanso executable path");
let service_content = String::from(LINUX_SERVICE_CONTENT)
.replace("{{{espanso_path}}}", &espanso_path.to_string_lossy());
std::fs::write(service_file, service_content)?;
} }
info_println!("creating service file in {:?}", service_file);
let espanso_path = get_binary_path().expect("unable to get espanso executable path");
let service_content = String::from(LINUX_SERVICE_CONTENT)
.replace("{{{espanso_path}}}", &espanso_path.to_string_lossy());
std::fs::write(service_file, service_content)?;
info_println!("enabling systemd service"); info_println!("enabling systemd service");
match Command::new("systemctl") match Command::new("systemctl")
@ -118,6 +123,17 @@ pub enum UnregisterError {
SystemdCallFailed(anyhow::Error), SystemdCallFailed(anyhow::Error),
} }
pub fn is_present() -> bool {
let res = Command::new("systemctl")
.args(&["--user", "cat", LINUX_SERVICE_NAME])
.output();
if let Ok(output) = res {
output.status.success()
} else {
false
}
}
pub fn is_registered() -> bool { pub fn is_registered() -> bool {
let res = Command::new("systemctl") let res = Command::new("systemctl")
.args(&["--user", "is-enabled", LINUX_SERVICE_NAME]) .args(&["--user", "is-enabled", LINUX_SERVICE_NAME])