From a4edf9afb83a3393e0d28bbb9d1a3ce8f2d70a5d Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 9 Jul 2018 13:33:56 -0400 Subject: [PATCH] Rename confluentutil to collective Also adjust output to be a bit more automation friendly. --- confluent_server/bin/{confluentutil => collective} | 2 +- confluent_server/setup.py.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename confluent_server/bin/{confluentutil => collective} (97%) diff --git a/confluent_server/bin/confluentutil b/confluent_server/bin/collective similarity index 97% rename from confluent_server/bin/confluentutil rename to confluent_server/bin/collective index c7f9b56d..15ef2582 100644 --- a/confluent_server/bin/confluentutil +++ b/confluent_server/bin/collective @@ -45,7 +45,7 @@ def show_invitation(name): if 'error' in invite: sys.stderr.write(invite['error'] + '\n') return - print ('Invitatation for {0}: {1}'.format(name, invite['invitation'])) + print('{0}'.format(invite['invitation'])) def join_collective(server, invitation): diff --git a/confluent_server/setup.py.tmpl b/confluent_server/setup.py.tmpl index 2acc60cf..f638f45d 100644 --- a/confluent_server/setup.py.tmpl +++ b/confluent_server/setup.py.tmpl @@ -20,7 +20,7 @@ setup( install_requires=['paramiko', 'pycrypto>=2.6', 'confluent_client>=0.1.0', 'eventlet', 'dnspython', 'netifaces', 'pyte', 'pysnmp', 'pyparsing', 'pyghmi>=1.0.44'], - scripts=['bin/confluent', 'bin/confluentdbutil', 'bin/confluentutil'], + scripts=['bin/confluent', 'bin/confluentdbutil', 'bin/collective'], data_files=[('/etc/init.d', ['sysvinit/confluent']), ('/usr/lib/sysctl.d', ['sysctl/confluent.conf']), ('/usr/lib/systemd/system', ['systemd/confluent.service']),