fix(ssh): bad argument when editing files over ssh (#370)

stevearc · May 13, 2024 · aa0c00c · aa0c00c
1 parent 010b44a
commit aa0c00c
Showing 1 changed file with 12 additions and 19 deletions.
diff --git a/lua/oil/adapters/ssh.lua b/lua/oil/adapters/ssh.lua
@@ -20,6 +20,13 @@ local FIELD_META = constants.FIELD_META
 ---@field port nil|integer
 ---@field path string
 
+---@param args string[]
+local function scp(args, ...)
+  local cmd = vim.list_extend({ "scp", "-C" }, config.extra_scp_args)
+  vim.list_extend(cmd, args)
+  shell.run(cmd, ...)
+end
+
 ---@param oil_url string
 ---@return oil.sshUrl
 M.parse_url = function(oil_url)
@@ -303,14 +310,7 @@ M.perform_action = function(action, cb)
       local src_conn = get_connection(action.src_url)
       local dest_conn = get_connection(action.dest_url)
       if src_conn ~= dest_conn then
-        shell.run({
-          "scp",
-          unpack(config.extra_scp_args),
-          "-C",
-          "-r",
-          url_to_scp(src_res),
-          url_to_scp(dest_res),
-        }, function(err)
+        scp({ "-r", url_to_scp(src_res), url_to_scp(dest_res) }, function(err)
           if err then
             return cb(err)
           end
@@ -329,14 +329,7 @@ M.perform_action = function(action, cb)
       local src_res = M.parse_url(action.src_url)
       local dest_res = M.parse_url(action.dest_url)
       if not url_hosts_equal(src_res, dest_res) then
-        shell.run({
-          "scp",
-          unpack(config.extra_scp_args),
-          "-C",
-          "-r",
-          url_to_scp(src_res),
-          url_to_scp(dest_res),
-        }, cb)
+        scp({ "-r", url_to_scp(src_res), url_to_scp(dest_res) }, cb)
       else
         local src_conn = get_connection(action.src_url)
         src_conn:cp(src_res.path, dest_res.path, cb)
@@ -355,7 +348,7 @@ M.perform_action = function(action, cb)
         src_arg = fs.posix_to_os_path(path)
         dest_arg = url_to_scp(M.parse_url(action.dest_url))
       end
-      shell.run({ "scp", unpack(config.extra_scp_args), "-C", "-r", src_arg, dest_arg }, cb)
+      scp({ "-r", src_arg, dest_arg }, cb)
     end
   else
     cb(string.format("Bad action type: %s", action.type))
@@ -379,7 +372,7 @@ M.read_file = function(bufnr)
   end
   local tmp_bufnr = vim.fn.bufadd(tmpfile)
 
-  shell.run({ "scp", unpack(config.extra_scp_args), "-C", scp_url, tmpfile }, function(err)
+  scp({ scp_url, tmpfile }, function(err)
     loading.set_loading(bufnr, false)
     vim.bo[bufnr].modifiable = true
     vim.cmd.doautocmd({ args = { "BufReadPre", bufname }, mods = { silent = true } })
@@ -419,7 +412,7 @@ M.write_file = function(bufnr)
   vim.cmd.write({ args = { tmpfile }, bang = true, mods = { silent = true, noautocmd = true } })
   local tmp_bufnr = vim.fn.bufadd(tmpfile)
 
-  shell.run({ "scp", unpack(config.extra_scp_args), "-C", tmpfile, scp_url }, function(err)
+  scp({ tmpfile, scp_url }, function(err)
     vim.bo[bufnr].modifiable = true
     if err then
       vim.notify(string.format("Error writing file: %s", err), vim.log.levels.ERROR)