mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-18 15:51:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

env: try find library dir (like /usr[/local]/lib/nvim) and add it to &rtp

Browse Source
This commit is contained in:
Björn Linse
2020-02-02 23:29:33 +01:00
parent 7ce9a5c7da
commit c5b812c9ea
5 changed files with 69 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nvim/os/env.c
View File

@@ -847,6 +847,20 @@ const void *vim_env_iter_rev(const char delim,
}
}
/// @param[out] exe_name should be at least MAXPATHL in size
void vim_get_prefix_from_exepath(char *exe_name)
{
// TODO(bfredl): param could have been written as "char exe_name[MAXPATHL]"
// but c_grammar.lua does not recognize it (yet).
xstrlcpy(exe_name, (char *)get_vim_var_str(VV_PROGPATH),
MAXPATHL * sizeof(*exe_name));
char *path_end = (char *)path_tail_with_sep((char_u *)exe_name);
*path_end = '\0'; // remove the trailing "nvim.exe"
path_end = (char *)path_tail((char_u *)exe_name);
*path_end = '\0'; // remove the trailing "bin/"
}
/// Vim getenv() wrapper with special handling of $HOME, $VIM, $VIMRUNTIME,
/// allowing the user to override the Nvim runtime directory at runtime.
/// Result must be freed by the caller.
@@ -902,12 +916,7 @@ char *vim_getenv(const char *name)
char exe_name[MAXPATHL];
// Find runtime path relative to the nvim binary: ../share/nvim/runtime
if (vim_path == NULL) {
xstrlcpy(exe_name, (char *)get_vim_var_str(VV_PROGPATH),
sizeof(exe_name));
char *path_end = (char *)path_tail_with_sep((char_u *)exe_name);
*path_end = '\0'; // remove the trailing "nvim.exe"
path_end = (char *)path_tail((char_u *)exe_name);
*path_end = '\0'; // remove the trailing "bin/"
vim_get_prefix_from_exepath(exe_name);
if (append_path(
exe_name,
"share" _PATHSEPSTR "nvim" _PATHSEPSTR "runtime" _PATHSEPSTR,