diff options
| -rwxr-xr-x | launch.sh | 2 | ||||
| -rw-r--r-- | poezio/args.py | 16 | ||||
| -rw-r--r-- | poezio/connection.py | 2 | ||||
| -rw-r--r-- | poezio/version.py | 1 |
4 files changed, 15 insertions, 6 deletions
@@ -25,5 +25,5 @@ else fi $PYTHON3 -c 'import sys;(print("Python 3.5 or newer is required") and exit(1)) if sys.version_info < (3, 5) else exit(0)' || exit 1 -exec "$PYTHON3" -m poezio -v "$args" "$@" +exec "$PYTHON3" -m poezio --custom-version "$args" "$@" diff --git a/poezio/args.py b/poezio/args.py index d0005d82..e1ebe5e0 100644 --- a/poezio/args.py +++ b/poezio/args.py @@ -6,6 +6,8 @@ There is a fallback to the deprecated optparse if argparse is not found from pathlib import Path from argparse import ArgumentParser, SUPPRESS +from poezio.version import __version__ + def parse_args(CONFIG_PATH: Path): """ @@ -33,11 +35,17 @@ def parse_args(CONFIG_PATH: Path): help="The config file you want to use", metavar="CONFIG_FILE") parser.add_argument( - "-v", - "--version", - dest="version", + '-v', + '--version', + action='version', + version='Poezio v%s' % __version__, + ) + parser.add_argument( + "--custom-version", + dest="custom_version", help=SUPPRESS, metavar="VERSION", - default="0.13-dev") + default=__version__ + ) options = parser.parse_args() return options diff --git a/poezio/connection.py b/poezio/connection.py index 57254069..d56b6c52 100644 --- a/poezio/connection.py +++ b/poezio/connection.py @@ -177,7 +177,7 @@ class Connection(slixmpp.ClientXMPP): self.register_plugin('xep_0196') if config.get('send_poezio_info'): - info = {'name': 'poezio', 'version': options.version} + info = {'name': 'poezio', 'version': options.custom_version} if config.get('send_os_info'): info['os'] = common.get_os_info() self.plugin['xep_0030'].set_identities(identities={('client', diff --git a/poezio/version.py b/poezio/version.py new file mode 100644 index 00000000..3543a785 --- /dev/null +++ b/poezio/version.py @@ -0,0 +1 @@ +__version__ = '0.13-dev' |