This commit is contained in:
Jonathan Roelofs
2017-12-29 09:23:06 -07:00
parent 4cd7dc02eb
commit ec97cd0c44
2 changed files with 10 additions and 0 deletions

View File

@@ -11,6 +11,7 @@ See these links for more details:
import argparse import argparse
import contextlib import contextlib
import functools import functools
import pkg_resources
import logging import logging
import os import os
import re import re
@@ -252,5 +253,9 @@ def main(device_type):
p.add_argument('-v', '--verbose', default=0, action='count') p.add_argument('-v', '--verbose', default=0, action='count')
p.set_defaults(func=run_unlock) p.set_defaults(func=run_unlock)
version = pkg_resources.require("trezor-agent")[0].version
parser.add_argument('--version', help='Print the version info',
action='version', version='%(prog)s ' + version)
args = parser.parse_args() args = parser.parse_args()
return args.func(device_type=device_type, args=args) return args.func(device_type=device_type, args=args)

View File

@@ -4,6 +4,7 @@ import functools
import io import io
import logging import logging
import os import os
import pkg_resources
import re import re
import subprocess import subprocess
import sys import sys
@@ -60,6 +61,10 @@ def create_agent_parser():
p = configargparse.ArgParser(default_config_files=['~/.ssh/agent.config']) p = configargparse.ArgParser(default_config_files=['~/.ssh/agent.config'])
p.add_argument('-v', '--verbose', default=0, action='count') p.add_argument('-v', '--verbose', default=0, action='count')
version = pkg_resources.require("trezor-agent")[0].version
p.add_argument('--version', help='Print the version info',
action='version', version='%(prog)s ' + version)
curve_names = [name for name in formats.SUPPORTED_CURVES] curve_names = [name for name in formats.SUPPORTED_CURVES]
curve_names = ', '.join(sorted(curve_names)) curve_names = ', '.join(sorted(curve_names))
p.add_argument('-e', '--ecdsa-curve-name', metavar='CURVE', p.add_argument('-e', '--ecdsa-curve-name', metavar='CURVE',