Remove luarock from build.rs

This commit is contained in:
Ottatop 2024-04-22 20:45:42 -05:00
parent ac15e2d566
commit 1b09fe94ee
3 changed files with 3 additions and 10 deletions

View file

@ -55,13 +55,5 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
.spawn()? .spawn()?
.wait()?; .wait()?;
std::env::set_current_dir("api/lua").unwrap();
Command::new("luarocks")
.arg("make")
.arg("--local")
.spawn()
.expect("Luarocks is not installed")
.wait()?;
Ok(()) Ok(())
} }

View file

@ -279,7 +279,7 @@ impl State {
let config_dir_clone = config_dir.as_ref().map(|dir| dir.as_ref().to_path_buf()); let config_dir_clone = config_dir.as_ref().map(|dir| dir.as_ref().to_path_buf());
let load_default_config = |state: &mut State, reason: &str| { let load_default_config = |state: &mut State, reason: &str| {
match &config_dir_clone { match &config_dir_clone {
Some(dir) => error!("Unable to load config at {}: {reason}", dir.display()), Some(dir) => warn!("Unable to load config at {}: {reason}", dir.display()),
None => panic!( None => panic!(
"builtin rust config crashed; this is a bug and you should open an issue" "builtin rust config crashed; this is a bug and you should open an issue"
), ),
@ -455,7 +455,6 @@ impl State {
std::thread::spawn(move || { std::thread::spawn(move || {
info!("Starting builtin Rust config"); info!("Starting builtin Rust config");
builtin::run(); builtin::run();
info!("Builtin config exited");
pinger.ping(); pinger.ping();
}); });

View file

@ -31,6 +31,7 @@ use smithay::{
}, },
}; };
use tokio::sync::mpsc::UnboundedSender; use tokio::sync::mpsc::UnboundedSender;
use tracing::info;
use xkbcommon::xkb::Keysym; use xkbcommon::xkb::Keysym;
use crate::state::State; use crate::state::State;
@ -427,6 +428,7 @@ impl State {
self.shutdown(); self.shutdown();
} }
Some(KeyAction::ReloadConfig) => { Some(KeyAction::ReloadConfig) => {
info!("Reloading config");
self.start_config(Some(self.config.dir(&self.xdg_base_dirs))) self.start_config(Some(self.config.dir(&self.xdg_base_dirs)))
.expect("failed to restart config"); .expect("failed to restart config");
} }