diff options
| -rw-r--r-- | lua/nvim-treesitter/shell_command_selectors.lua | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lua/nvim-treesitter/shell_command_selectors.lua b/lua/nvim-treesitter/shell_command_selectors.lua index 2aff84c67..9df209661 100644 --- a/lua/nvim-treesitter/shell_command_selectors.lua +++ b/lua/nvim-treesitter/shell_command_selectors.lua @@ -120,12 +120,19 @@ function M.select_mv_cmd(from, to, cwd) end function M.select_download_commands(repo, project_name, cache_folder, revision) +<<<<<<< HEAD + local has_tar = vim.fn.executable('tar') == 1 + local has_curl = vim.fn.executable('curl') == 1 local is_github = repo.url:find("github.com", 1, true) local is_gitlab = repo.url:find("gitlab.com", 1, true) local is_windows = fn.hs('win32') - if vim.fn.executable('tar') == 1 and vim.fn.executable('curl') == 1 and (is_github or is_gitlab) and not is_windows then + if has_tar andhas_curl and (is_github or is_gitlab) and not is_windows then +======= + local has_tar = vim.fn.executable('tar') == 1 and not fn.hs('win32') + if has_tar and vim.fn.executable('curl') == 1 and repo.url:find("github.com", 1, true) then +>>>>>>> 99a672f (style) revision = revision or repo.branch or "master" local path_sep = utils.get_path_sep() |