leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: add fallback to XDG_DATA_DIRS for icon search

Browse source
This commit is contained in:
Joshua Megnauth 2024-03-31 12:57:35 +00:00 • committed by GitHub
parent e1b5e32b4c
commit 2dd82bb73c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cosmic-settings/src/pages/desktop/appearance.rs
View file

@ -1499,14 +1499,14 @@ async fn fetch_icon_themes() -> Message {
.or_else(dirs::home_dir)
.map(|dir| dir.join(".local/share/icons"));
let xdg_data_dirs = std::env::var("XDG_DATA_DIRS");
let xdg_data_dirs = std::env::var("XDG_DATA_DIRS").ok();
let xdg_data_dirs = xdg_data_dirs
.as_ref()
.ok()
.as_deref()
// Default from the XDG Base Directory Specification
.or(Some("/usr/local/share/:/usr/share/"))
.into_iter()
.flat_map(|data_dirs| data_dirs.split_terminator(':'))
.map(|dir| Path::new(dir).join("icons"));
.flat_map(|arg| std::env::split_paths(arg).map(|dir| dir.join("icons")));
for icon_dir in xdg_data_dirs.chain(xdg_data_home) {
let Ok(read_dir) = std::fs::read_dir(&icon_dir) else {