Fix path normalization on Windows

This commit is contained in:
Teoh Han Hui 2024-07-09 01:35:31 +08:00
parent fa66bb486b
commit 290da7c363
No known key found for this signature in database
GPG key ID: D43E2BABAF97DCAE
5 changed files with 37 additions and 2 deletions

View file

@ -38,6 +38,7 @@ unicode-normalization = { workspace = true, features = ["std"] }
[target.'cfg(windows)'.dependencies]
enable-ansi-support = { workspace = true, features = [] }
normpath = { workspace = true, features = [] }
[features]
default = ["autocomplete", "color"]

View file

@ -16,7 +16,9 @@ use tracing::debug;
fn main() -> Result<()> {
#[cfg(windows)]
enable_ansi_support::enable_ansi_support();
if let Err(err) = enable_ansi_support::enable_ansi_support() {
debug!(err, "could not enable ANSI escape code support");
}
let options = options().run();

View file

@ -11,6 +11,8 @@ use std::{env, fmt};
use aho_corasick::AhoCorasick;
use anyhow::{anyhow, Context, Result};
use indexmap::IndexMap;
#[cfg(windows)]
use normpath::PathExt as _;
use serde::{Deserialize, Serialize};
use tempfile::NamedTempFile;
use tracing::debug;
@ -223,7 +225,13 @@ pub fn get_command_path() -> Result<PathBuf> {
let path = path.join("neofetch");
match path.try_exists() {
Ok(true) => {
#[cfg(not(windows))]
return path.canonicalize().context("failed to canonicalize path");
#[cfg(windows)]
return path
.normalize()
.map(|p| p.into())
.context("failed to normalize path");
},
Ok(false) => {
Err(anyhow!("{path:?} does not exist or is not readable"))?;
@ -245,7 +253,13 @@ pub fn get_command_path() -> Result<PathBuf> {
if !path.is_file() {
continue;
}
#[cfg(not(windows))]
return path.canonicalize().context("failed to canonicalize path");
#[cfg(windows)]
return path
.normalize()
.map(|p| p.into())
.context("failed to normalize path");
}
Err(anyhow!("neofetch command not found"))
@ -259,7 +273,14 @@ pub fn ensure_git_bash() -> Result<PathBuf> {
let git_bash_path = {
// Bundled git bash
let current_exe_path = env::current_exe()
.and_then(|p| p.canonicalize())
.and_then(|p| {
#[cfg(not(windows))]
{
p.canonicalize()
}
#[cfg(windows)]
p.normalize().map(|p| p.into())
})
.context("failed to get path of current running executable")?;
let bash_path = current_exe_path.join("git/bin/bash.exe");
if bash_path.is_file() {