Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Quote SSH arguments #91

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

Merged
anki-code merged 2 commits into from
Jun 20, 2020
Merged

Quote SSH arguments #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1437953
Remove trailing spaces
chitoku-k Jun 19, 2020
965bb9c
Quote SSH arguments
chitoku-k Jun 19, 2020
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
11 changes: 9 additions & 2 deletions xxh_xxh/shell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,16 @@ def SC(cmd):
[out, err] = proc.communicate()
return (out, err, proc)

def A(args, q=0):
def A(args, q=0, i=0):
if type(args) == list:
args = ' '.join([str(a) for a in args])
if i == 1:
args = ' '.join([f"'{a}'" for a in args])
elif i == 2:
args = ' '.join([f'"{a}"' for a in args])
elif i == 3:
args = ' '.join([f'\\"{a}\\"' for a in args])
else:
args = ' '.join([str(a) for a in args])
if q == 1:
return f"'{args}'"
elif q == 2:
Expand Down
16 changes: 8 additions & 8 deletions xxh_xxh/xxh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ def get_host_info(self):
echo scp=`command -v scp`
echo shell=`command -v {short_shell_name}`
echo kernel=`uname -s`
echo arch=`uname -m`
echo arch=`uname -m`
""".format(
host_xxh_home=self.host_xxh_home,
shell=self.shell,
Expand All @@ -284,7 +284,7 @@ def get_host_info(self):
host_info_s=host_info_s.strip().replace('\n','\\n').replace('"','\\"').replace('$','\\$').replace('`','\\`'),
ssh=self.ssh_command,
ssh_v=('' if not self.ssh_arg_v else '-v'),
ssh_arguments=A(self.ssh_arguments),
ssh_arguments=A(self.ssh_arguments, 0, 2),
host=host
)

Expand Down Expand Up @@ -318,7 +318,7 @@ def get_host_info(self):
sshpass=A(self.sshpass),
ssh=A(self.ssh_command),
ssh_arg_v=A(self.ssh_arg_v),
ssh_arguments=A(self.ssh_arguments),
ssh_arguments=A(self.ssh_arguments, 0, 2),
host=A(host)
))
r = o.strip()
Expand Down Expand Up @@ -708,7 +708,7 @@ def packages_operations():
opt.ssh_login = url.username
if opt.ssh_login:
username = opt.ssh_login

self.ssh_command = opt.ssh_command
self.ssh_arguments = ['-o', 'StrictHostKeyChecking=accept-new']
if not self.verbose:
Expand Down Expand Up @@ -809,7 +809,7 @@ def packages_operations():
sshpass=A(self.sshpass),
ssh=A(self.ssh_command),
ssh_arg_v=A(self.ssh_arg_v),
ssh_arguments=A(self.ssh_arguments),
ssh_arguments=A(self.ssh_arguments, 0, 2),
host=A(host)
)

Expand Down Expand Up @@ -951,7 +951,7 @@ def packages_operations():
sshpass=A(self.sshpass),
ssh=A(self.ssh_command),
ssh_arg_v=('' if self.ssh_arg_v == [] else '-v'),
ssh_arguments=A(self.ssh_arguments),
ssh_arguments=A(self.ssh_arguments, 0, 3),
arg_q=A(arg_q),
progress=('' if self.quiet or not self.verbose else '--progress')
)
Expand Down Expand Up @@ -982,7 +982,7 @@ def packages_operations():
sshpass=A(self.sshpass),
scp_command=A(self.scp_command),
ssh_arg_v=A(self.ssh_arg_v),
ssh_arguments=A(self.ssh_arguments),
ssh_arguments=A(self.ssh_arguments, 0, 1),
arg_q=A(arg_q)
)

Expand Down Expand Up @@ -1079,7 +1079,7 @@ def packages_operations():
sshpass=A(self.sshpass),
ssh=A(self.ssh_command),
ssh_arg_v=A(self.ssh_arg_v),
ssh_arguments=A(self.ssh_arguments),
ssh_arguments=A(self.ssh_arguments, 0, 1),
host=A(host),
entrypoint_command=entrypoint_command
))
Expand Down