Leahnaya/hyfetch
1
0
Fork 0
mirror of https://github.com/hykilpikonna/hyfetch.git synced 2026-09-11 02:18:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

[F] Fix #503 (#509)

Browse Source 
[F] Fix #503?
This commit is contained in:
Azalea
2026-06-02 08:56:24 +08:00
committed by GitHub
parent 6a274ec021
commit 32c9c182e6
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
crates/hyfetch/src/neofetch_util.rs
View File

@@ -237,6 +237,26 @@ pub fn macchina_path() -> Result<Option<PathBuf>> {
Ok(macchina_path)
}
#[cfg(feature = "macchina")]
fn macchina_themes_path() -> Result<PathBuf> {
#[cfg(target_os = "macos")]
{
return Ok(PathBuf::from(
env::var_os("HOME").context("`HOME` env var is not set or invalid")?,
)
.join(".config")
.join("macchina")
.join("themes"));
}
#[cfg(not(target_os = "macos"))]
{
let project_dirs = directories::ProjectDirs::from("", "", "macchina")
.context("failed to get base dirs")?;
Ok(project_dirs.config_dir().join("themes"))
}
}
/// Gets the distro ascii of the current distro. Or if distro is specified, get
/// the specific distro's ascii art instead.
#[tracing::instrument(level = "debug")]
@@ -539,9 +559,8 @@ pub fn get_distro_name(backend: Backend) -> Result<String> {
// Write macchina theme to temp file
let theme_file_path = {
let project_dirs = directories::ProjectDirs::from("", "", "macchina")
.context("failed to get base dirs")?;
let themes_path = project_dirs.config_dir().join("themes");
let themes_path =
macchina_themes_path().context("failed to get macchina themes dir")?;
fs::create_dir_all(&themes_path).with_context(|| {
format!("failed to create macchina themes dir {themes_path:?}")
})?;
@@ -698,9 +717,7 @@ fn run_macchina(asc: String, args: Option<&Vec<String>>, palette: Option<Palette
// Write macchina theme to temp file
let theme_file_path = {
let project_dirs = directories::ProjectDirs::from("", "", "macchina")
.context("failed to get base dirs")?;
let themes_path = project_dirs.config_dir().join("themes");
let themes_path = macchina_themes_path().context("failed to get macchina themes dir")?;
fs::create_dir_all(&themes_path)
.with_context(|| format!("failed to create macchina themes dir {themes_path:?}"))?;
let mut temp_file = tempfile::Builder::new()