Skip to content

Update command prefixes to default to sh for linux. #108

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

Update command prefixes to default to sh for linux. #108

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
23 changes: 13 additions & 10 deletions azext/batch/_template_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,22 +202,23 @@ def _strip_prefix(cmd_line):
"""Strip an OS operating prefix from a command line.
"""
if cmd_line.startswith('cmd.exe /c '):
return cmd_line[11:].strip('"')
return 'cmd.exe /c ', cmd_line[11:].strip('"')
# Always use full cmd name for windows
if cmd_line.startswith('cmd /c '):
return cmd_line[7:].strip('"')
return 'cmd.exe /c ', cmd_line[7:].strip('"')
if cmd_line.startswith('/bin/bash -c '):
return cmd_line[13:]
return '/bin/bash -c ', cmd_line[13:]
if cmd_line.startswith('/bin/sh -c '):
return cmd_line[11:]
return cmd_line
return '/bin/sh -c ', cmd_line[11:]
return "", cmd_line

def _add_cmd_prefix(task, os_flavor):
"""Add OS-specific command prefix to command line."""
if os_flavor == pool_utils.PoolOperatingSystemFlavor.WINDOWS:
# TODO: Do we need windows shell escaping?
task.command_line = 'cmd /c "{}"'.format(task.command_line) #.replace('\"','\\\\\"')
elif os_flavor == pool_utils.PoolOperatingSystemFlavor.LINUX:
task.command_line = '/bin/bash -c \'set -e; set -o pipefail; {}; wait\''.format(task.command_line)
task.command_line = '/bin/sh -c \'set -e; set -o pipefail; {}; wait\''.format(task.command_line)
else:
raise ValueError("Unknown pool OS flavor: " + str(os_flavor))

Expand Down Expand Up @@ -1041,22 +1042,24 @@ def construct_setup_task(existing_task, command_info, os_flavor):
if os_flavor == pool_utils.PoolOperatingSystemFlavor.WINDOWS:
result['command_line'] = 'cmd.exe /c "{}"'.format(result['command_line'])
elif os_flavor == pool_utils.PoolOperatingSystemFlavor.LINUX:
result['command_line'] = '/bin/bash -c {}'.format(result['command_line'])
result['command_line'] = '/bin/sh -c {}'.format(result['command_line'])
else:
raise ValueError("Unknown pool OS flavor: " + str(os_flavor))
return result if result else None
prefix = ""
if result.get('command_line'):
commands.append(_strip_prefix(result['command_line']))
prefix, cmd = _strip_prefix(result['command_line'])
commands.append(cmd)
resources.extend(result.get('resource_files', []))
if os_flavor == pool_utils.PoolOperatingSystemFlavor.WINDOWS:
full_win_cmd = ' & '.join(commands)
result['command_line'] = 'cmd.exe /c "{}"'.format(full_win_cmd)
result['command_line'] = '{} "{}"'.format(prefix, full_win_cmd)
result['user_identity'] = models.UserIdentity(
auto_user=models.AutoUserSpecification(scope="task", elevation_level="admin"))
elif os_flavor == pool_utils.PoolOperatingSystemFlavor.LINUX:
# Escape the users command line
full_linux_cmd = shell_escape(';'.join(commands))
result['command_line'] = '/bin/bash -c {}'.format(full_linux_cmd)
result['command_line'] = '{} {}'.format(prefix, full_linux_cmd)
result['user_identity'] = models.UserIdentity(
auto_user=models.AutoUserSpecification(scope="pool", elevation_level="admin"))
else:
Expand Down