Skip to content

Skip XDG base directories #104

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
djc merged 1 commit into from
Apr 17, 2026
Merged

Skip XDG base directories #104

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
7 changes: 0 additions & 7 deletions Cargo.lock
View file
Open in desktop

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

1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ toml = "1"
tracing = "0.1"
tracing-subscriber = "0.3"
x509-parser = "0.18"
xdg = "3.0.0"
cbindgen = "0.29"
webpki-ccadb = "0.2.1"
webpki-roots = "1"
Expand Down
7 changes: 1 addition & 6 deletions upki/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ base64.workspace = true
chrono.workspace = true
clap.workspace = true
clubcard-crlite.workspace = true
directories.workspace = true
eyre.workspace = true
hex.workspace = true
reqwest.workspace = true
Expand All @@ -27,12 +28,6 @@ toml.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true

[target.'cfg(target_os = "linux")'.dependencies]
xdg.workspace = true

[target.'cfg(not(target_os = "linux"))'.dependencies]
directories.workspace = true

[dev-dependencies]
insta.workspace = true
insta-cmd.workspace = true
Expand Down
21 changes: 0 additions & 21 deletions upki/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,27 +95,6 @@ impl AsRef<Path> for ConfigPath {
}
}

#[cfg(target_os = "linux")]
mod platform {
use xdg::BaseDirectories;

use super::*;

pub(super) fn find_config_file() -> Result<PathBuf, Error> {
let bd = BaseDirectories::with_prefix(PREFIX);
bd.find_config_file(CONFIG_FILE)
.or_else(|| bd.get_config_file(CONFIG_FILE))
.ok_or(Error::NoConfigDirectoryFound)
}

pub(super) fn default_cache_dir() -> Result<PathBuf, Error> {
BaseDirectories::with_prefix(PREFIX)
.get_cache_home()
.ok_or(Error::NoCacheDirectoryFound)
}
}

#[cfg(not(target_os = "linux"))]
mod platform {
use directories::ProjectDirs;

Expand Down