Implement katello-ssl-tool via console_scripts

.travis/test.sh

@@ -7,7 +7,7 @@ export LC_ALL=en_US.UTF-8
 TEST_ON_EL=$([ -f /etc/redhat-release ] && [ -x /usr/bin/yum ] && echo "true" || echo "false")
 
 if [[ "${TEST_ON_EL}" == "true" ]]; then
-  yum install -y docbook-utils openssl rpm-build
+  yum install -y docbook-utils openssl rpm-build python-setuptools
 fi
 
 docbook2man katello-ssl-tool.sgml

katello_certs_tools/katello_ssl_tool.py

@@ -993,9 +993,9 @@ def main():
     def writeError(e):
         sys.stderr.write('\nERROR: %s\n' % e)
 
-    ret = 0
     try:
-        ret = _main() or 0
+        _main()
+        ret = 0
     # CA key set errors
     except GenPrivateCaKeyException as e:
         writeError(e)
@@ -1041,5 +1041,11 @@ def writeError(e):
     except KatelloSslToolException as e:
         writeError(e)
         ret = 100
+    except KeyboardInterrupt:
+        sys.stderr.write("\nUser interrupted process.\n")
+        ret = 0
+    except:  # noqa
+        sys.stderr.write("\nERROR: unhandled exception occurred:\n")
+        raise
 
-    return ret
+    sys.exit(ret)

setup.py

@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup
 
 setup(name='Katello Certs Tools',
       version='2.6.1',
@@ -7,5 +7,10 @@
       author_email='[email protected]',
       url='https://github.com/Katello/katello-certs-tools',
       packages=['katello_certs_tools'],
-      scripts=['katello-ssl-tool', 'katello-sudo-ssl-tool', 'katello-certs-sign', 'katello-certs-gen-rpm'],
+      scripts=['katello-certs-sign', 'katello-certs-gen-rpm'],
+      entry_points={
+          'console_scripts': [
+              'katello-ssl-tool = katello_certs_tools.katello_ssl_tool:main',
+          ],
+      },
       data_files=[('share/man/man1', ['katello-ssl-tool.1'])])