From ddaff9923b8dc61ab5870fb45c6afbc4806c5097 Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Thu, 31 Oct 2013 14:03:55 +0100 Subject: [PATCH] Remove now unused e2lib.ssh(), improve ssh_remote_cmd() Signed-off-by: Tobias Ulmer --- generic/e2lib.lua | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/generic/e2lib.lua b/generic/e2lib.lua index a8bbfb2..fd03c41 100644 --- a/generic/e2lib.lua +++ b/generic/e2lib.lua @@ -1965,21 +1965,11 @@ function e2lib.curl(argv) return e2lib.call_tool_argv("curl", argv) end ---- call the ssh command --- @param argv table: argument vector --- @return bool --- @return an error object on failure -function e2lib.ssh(argv) - assert(type(argv) == "table") - - return e2lib.call_tool_argv("ssh", argv) -end - --- Run command on remote server via SSH. -- @param u URL object pointing to the remote server. -- @param argv Command vector to run on the remote server. -- @return True on success, false on error. --- @retrun Error object on failure. +-- @return Error object on failure. function e2lib.ssh_remote_cmd(u, argv) local v, command @@ -1998,24 +1988,20 @@ function e2lib.ssh_remote_cmd(u, argv) table.insert(v, u.user) end - if not u.server then + if not u.servername then return false, - err.new("ssh_remote_cmd: no server component in URL %q", u.url) + err.new("ssh_remote_cmd: no server name in URL %q", u.url) end + table.insert(v, u.servername) - table.insert(v, u.server) - - command = "" + command = {} for i, arg in ipairs(argv) do - if i ~= 1 then - command = command .. " " - end - command = command .. e2lib.shquote(arg) + table.insert(command, e2lib.shquote(arg)) end - table.insert(v, command) + table.insert(v, table.concat(command, " ")) - return e2lib.ssh(v) + return e2lib.call_tool_argv("ssh", v) end --- call the scp command -- 2.39.5