barrett/canola.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

fix: add busybox support for ssh adapter (#173)

Browse source
This commit is contained in:
Steven Arcangeli 2023-09-21 12:12:57 -07:00 • committed by GitHub
parent 83e4d04922
commit a9ceb90a63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lua/oil/adapters/ssh/sshfs.lua
View file

@ -105,7 +105,7 @@ function SSHFS:realpath(path, callback)
if vim.endswith(abspath, ".") then if vim.endswith(abspath, ".") then
abspath = abspath:sub(1, #abspath - 1) abspath = abspath:sub(1, #abspath - 1)
end end
self.conn:run(string.format("ls -fld '%s'", abspath), function(ls_err, ls_lines) self.conn:run(string.format("ls -ald --color=never '%s'", abspath), function(ls_err, ls_lines)
local type local type
if ls_err then if ls_err then
-- If the file doesn't exist, treat it like a not-yet-existing directory -- If the file doesn't exist, treat it like a not-yet-existing directory
@ -133,7 +133,7 @@ function SSHFS:list_dir(url, path, callback)
if path ~= "" then if path ~= "" then
path_postfix = string.format(" '%s'", path) path_postfix = string.format(" '%s'", path)
end end
self.conn:run("LANG=C ls -fl" .. path_postfix, function(err, lines) self.conn:run("LANG=C ls -al --color=never" .. path_postfix, function(err, lines)
if err then if err then
if err:match("No such file or directory%s*$") then if err:match("No such file or directory%s*$") then
-- If the directory doesn't exist, treat the list as a success. We will be able to traverse -- If the directory doesn't exist, treat the list as a success. We will be able to traverse
@ -166,7 +166,7 @@ function SSHFS:list_dir(url, path, callback)
if any_links then if any_links then
-- If there were any soft links, then we need to run another ls command with -L so that we can -- If there were any soft links, then we need to run another ls command with -L so that we can
-- resolve the type of the link target -- resolve the type of the link target
self.conn:run("ls -fLl" .. path_postfix, function(link_err, link_lines) self.conn:run("ls -aLl --color=never" .. path_postfix, function(link_err, link_lines)
-- Ignore exit code 1. That just means one of the links could not be resolved. -- Ignore exit code 1. That just means one of the links could not be resolved.
if link_err and not link_err:match("^1:") then if link_err and not link_err:match("^1:") then
return callback(link_err) return callback(link_err)