mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-04 19:37:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Canonicalize executable path

Browse source 
When looking up the runtime/ directory relative to the executable path,
canonicalize the path first in case the executable is a symbolic link.

Fixes #3768
This commit is contained in:
Ben Noordhuis 2022-09-11 09:13:45 +02:00 • committed by Benoît Cortier
parent ec81ec1e8d
commit b5be72bff7
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
helix-loader/src/lib.rs
View file

@ -42,8 +42,10 @@ pub fn runtime_dir() -> PathBuf {
} }
// fallback to location of the executable being run // fallback to location of the executable being run
// canonicalize the path in case the executable is symlinked
std::env::current_exe() std::env::current_exe()
.ok() .ok()
.and_then(|path| std::fs::canonicalize(path).ok())
.and_then(|path| path.parent().map(|path| path.to_path_buf().join(RT_DIR))) .and_then(|path| path.parent().map(|path| path.to_path_buf().join(RT_DIR)))
.unwrap() .unwrap()
} }