Skip to content

Fix escaping issue for shell commands #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix escaping issue for shell commands #401

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions lua/overseer/shell.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,20 +182,15 @@ M.escape_cmd = function(cmd, method, shell)
local config = get_config_for_shell(shell)

local pieces = {}
local cmd_quoted = false
local args_quoted = false
for i, v in ipairs(cmd) do
local arg_quote_method
if type(v) == "table" then
arg_quote_method = v.quoting
v = v.value
end
if needs_quote(v, config) then
if i == 1 then
cmd_quoted = true
else
args_quoted = true
end
if i ~= 1 and needs_quote(v, config) then
args_quoted = true
local escaped = escape(v, arg_quote_method or method, config)
table.insert(pieces, escaped)
else
Expand All @@ -205,12 +200,12 @@ M.escape_cmd = function(cmd, method, shell)

local str_cmd = table.concat(pieces, " ")
local norm_shell = M.normalize_shell_name(shell)
if norm_shell == "powershell" and cmd_quoted then
if norm_shell == "powershell" then
str_cmd = "& " .. str_cmd
elseif norm_shell == "cmd" and cmd_quoted and args_quoted then
elseif norm_shell == "cmd" and args_quoted then
str_cmd = wrap(str_cmd, '"')
end
return str_cmd, cmd_quoted or args_quoted
return str_cmd, args_quoted
end

return M
Loading