Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export RUSTUP_TOOLCHAIN
# Optional wireless iface for `make dev` (e.g. INTERFACE=wlan0).
INTERFACE ?=

.PHONY: all build release release-musl check test test-release-assertions clean fmt clippy dev
.PHONY: all build release release-musl check test test-release-assertions clean fmt clippy dev deps-update

all: build

Expand Down Expand Up @@ -54,6 +54,10 @@ fmt:
clippy:
$(CARGO) clippy --workspace --all-targets --locked -- -D warnings

# Refresh git crates (bigfred-shared-daemon) and rewrite Cargo.lock. Commit the lockfile afterwards.
deps-update:
$(CARGO) update -p bigfred-shared-daemon

clean:
$(CARGO) clean
rm -rf dist
Expand Down
3 changes: 2 additions & 1 deletion crates/wireless-programmer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ clap = { version = "4", features = ["derive"] }
humantime = "2"
thiserror = "2"
tokio = { version = "1", features = ["rt-multi-thread", "macros", "net", "signal", "time", "sync", "io-util"] }
nix = { version = "0.29", features = ["user", "socket", "fs"] }
nix = { version = "0.29", features = ["user", "fs"] }
bigfred-shared-daemon = { git = "https://github.com/dcc-bigfred/rust-commons.git", branch = "main", default-features = false, features = ["ipc"] }
libc = "0.2"
parking_lot = "0.12"
tracing = "0.1"
Expand Down
13 changes: 6 additions & 7 deletions crates/wireless-programmer/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,12 @@ fn resolve_fake_web_port_env() -> Option<u16> {

/// Resolve the BigFred data directory.
pub fn resolve_data_dir() -> PathBuf {
if let Ok(d) = std::env::var("BIGFRED_DATA_DIR") {
return PathBuf::from(d);
}
if let Ok(d) = std::env::var("DATA_DIR") {
return PathBuf::from(d);
}
PathBuf::from("/data")
bigfred_shared_daemon::DataDir::resolve(
bigfred_shared_daemon::EnvPolicy::BigfredThenDataDir,
bigfred_shared_daemon::PathRule::AcceptAny,
)
.as_path()
.to_path_buf()
}

#[cfg(test)]
Expand Down
Loading
Loading