From 97b6d1f57704c452185ec9c2b21dea67e4b50430 Mon Sep 17 00:00:00 2001 From: glacambre Date: Sun, 15 Dec 2024 09:06:30 +0100 Subject: [PATCH] firenvim.vim: check for more edge install paths on OSX Oddly enough, edge on OSX has already been reported as working in #560, but for some reason #1651 reports a different installation path. Check for both. Closes #1651. --- autoload/firenvim.vim | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/autoload/firenvim.vim b/autoload/firenvim.vim index d56bb764..8aa01871 100644 --- a/autoload/firenvim.vim +++ b/autoload/firenvim.vim @@ -435,6 +435,9 @@ function! s:edge_config_exists() abort let l:p = [$HOME, '.config', 'microsoft-edge'] if has('mac') let l:p = [$HOME, 'Library', 'Application Support', 'Microsoft', 'Edge'] + if !isdirectory(s:build_path(l:p)) + let l:p = [$HOME, 'Library', 'Application Support', 'Microsoft Edge'] + endif elseif has('win32') let l:p = [$HOME, 'AppData', 'Local', 'Microsoft', 'Edge'] elseif s:is_wsl @@ -492,7 +495,11 @@ endfunction function! s:get_edge_manifest_dir_path() abort if has('mac') - return s:build_path([$HOME, 'Library', 'Application Support', 'Microsoft', 'Edge', 'NativeMessagingHosts']) + let l:p = [$HOME, 'Library', 'Application Support', 'Microsoft', 'Edge'] + if !isdirectory(s:build_path(l:p)) + let l:p = [$HOME, 'Library', 'Application Support', 'Microsoft Edge'] + endif + return s:build_path([l:p, 'NativeMessagingHosts']) elseif has('win32') || s:is_wsl return s:get_data_dir_path() end