Merge pull request #678 from shawn-ogg/master

Fix argument handling of the --execute flag
This commit is contained in:
Matt Rose 2022-11-18 15:31:47 -05:00 committed by GitHub
commit bcb9cbc6ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions

View File

@ -62,14 +62,16 @@ def parse_options():
else: else:
parser.add_argument('--command', dest='command', parser.add_argument('--command', dest='command',
help=_('Specify a command to execute inside the terminal')) help=_('Specify a command to execute inside the terminal'))
parser.add_argument('-e', '--execute2', dest='execute', action=ExecuteCallback, parser.add_argument('-e', '--execute2', dest='execute',
nargs=argparse.REMAINDER, action=ExecuteCallback,
help=_('Use the rest of the command line as a command to ' help=_('Use the rest of the command line as a command to '
'execute inside the terminal, and its arguments')) 'execute inside the terminal, and its arguments'))
parser.add_argument('-g', '--config', dest='config', parser.add_argument('-g', '--config', dest='config',
help=_('Specify a config file')) help=_('Specify a config file'))
parser.add_argument('-j', '--config-json', dest='configjson', parser.add_argument('-j', '--config-json', dest='configjson',
help=_('Specify a partial config json file')) help=_('Specify a partial config json file'))
parser.add_argument('-x', '--execute', dest='execute', action=ExecuteCallback, parser.add_argument('-x', '--execute', dest='execute',
nargs=argparse.REMAINDER, action=ExecuteCallback,
help=_('Use the rest of the command line as a command to execute ' help=_('Use the rest of the command line as a command to execute '
'inside the terminal, and its arguments')) 'inside the terminal, and its arguments'))
parser.add_argument('--working-directory', metavar='DIR', parser.add_argument('--working-directory', metavar='DIR',