Skip to content

fix atuin-daemon optional dependency #2306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2024
Merged

fix atuin-daemon optional dependency #2306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions crates/atuin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ atuin = { path = "/usr/bin/atuin" }
default = ["client", "sync", "server", "clipboard", "check-update", "daemon"]
client = ["atuin-client"]
sync = ["atuin-client/sync"]
daemon = ["atuin-client/daemon"]
daemon = ["atuin-client/daemon", "atuin-daemon"]
server = ["atuin-server", "atuin-server-postgres"]
clipboard = ["arboard"]
check-update = ["atuin-client/check-update"]
Expand All @@ -48,7 +48,7 @@ atuin-client = { path = "../atuin-client", version = "18.4.0-beta.3", optional =
atuin-common = { path = "../atuin-common", version = "18.4.0-beta.3" }
atuin-dotfiles = { path = "../atuin-dotfiles", version = "18.4.0-beta.3" }
atuin-history = { path = "../atuin-history", version = "18.4.0-beta.3" }
atuin-daemon = { path = "../atuin-daemon", version = "18.4.0-beta.3" }
atuin-daemon = { path = "../atuin-daemon", version = "18.4.0-beta.3", optional = true, default-features = false }

log = { workspace = true }
env_logger = "0.11.2"
Expand Down
3 changes: 3 additions & 0 deletions crates/atuin/src/command/client/history.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ impl Cmd {
Ok(())
}

#[cfg(feature = "daemon")]
async fn handle_daemon_start(settings: &Settings, command: &[String]) -> Result<()> {
let command = command.join(" ");

Expand Down Expand Up @@ -425,6 +426,7 @@ impl Cmd {
Ok(())
}

#[cfg(feature = "daemon")]
#[allow(unused_variables)]
async fn handle_daemon_end(
settings: &Settings,
Expand Down Expand Up @@ -543,6 +545,7 @@ impl Cmd {
pub async fn run(self, settings: &Settings) -> Result<()> {
let context = current_context();

#[cfg(feature = "daemon")]
// Skip initializing any databases for start/end, if the daemon is enabled
if settings.daemon.enabled {
match self {
Expand Down