From b04153d6d401a9e9bbc0aebc4bbec3e0021fe4ec Mon Sep 17 00:00:00 2001
From: Pavlos Ratis <dastergon@gentoo.org>
Date: Thu, 8 Jan 2015 22:42:20 +0200
Subject: Rename gkey-gen to gkeys-gen for consistency

---
 gkeys-gen/bin/gkey-gen       | 53 --------------------------------------------
 gkeys-gen/bin/gkeys-gen      | 53 ++++++++++++++++++++++++++++++++++++++++++++
 gkeys-gen/gkeygen/actions.py |  4 ++--
 gkeys-gen/setup.py           |  4 ++--
 4 files changed, 57 insertions(+), 57 deletions(-)
 delete mode 100755 gkeys-gen/bin/gkey-gen
 create mode 100755 gkeys-gen/bin/gkeys-gen

(limited to 'gkeys-gen')

diff --git a/gkeys-gen/bin/gkey-gen b/gkeys-gen/bin/gkey-gen
deleted file mode 100755
index 9acfc88..0000000
--- a/gkeys-gen/bin/gkey-gen
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-'''Gentoo-keys is a gpg key manager for managing
- gentoo's gpg-signing keys.  It is these keys that are
- used to verify and validate release media, etc..
-
- Distributed under the terms of the GNU General Public License v2
-
- Copyright:
-             (c) 2014 Pavlos Ratis
-             Distributed under the terms of the GNU General Public License v2
-
- Author(s):
-             Pavlos Ratis <dastergon@gentoo.org>
-
-'''
-
-from __future__ import print_function
-
-from gkeygen.cli import Main
-
-import os
-import sys
-
-
-# This block ensures that ^C interrupts are handled quietly.
-try:
-    import signal
-
-    def exithandler(signum,frame):
-        signal.signal(signal.SIGINT, signal.SIG_IGN)
-        signal.signal(signal.SIGTERM, signal.SIG_IGN)
-        print()
-        sys.exit(1)
-
-    signal.signal(signal.SIGINT, exithandler)
-    signal.signal(signal.SIGTERM, exithandler)
-    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
-
-except KeyboardInterrupt:
-    print()
-    sys.exit(1)
-
-root = None
-if 'ROOT' in os.environ:
-    root = os.environ['ROOT']
-
-main = Main(root=root)
-success = main()
-
-# exit is boolean opposite normal True/False
-sys.exit(not success)
diff --git a/gkeys-gen/bin/gkeys-gen b/gkeys-gen/bin/gkeys-gen
new file mode 100755
index 0000000..9acfc88
--- /dev/null
+++ b/gkeys-gen/bin/gkeys-gen
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+'''Gentoo-keys is a gpg key manager for managing
+ gentoo's gpg-signing keys.  It is these keys that are
+ used to verify and validate release media, etc..
+
+ Distributed under the terms of the GNU General Public License v2
+
+ Copyright:
+             (c) 2014 Pavlos Ratis
+             Distributed under the terms of the GNU General Public License v2
+
+ Author(s):
+             Pavlos Ratis <dastergon@gentoo.org>
+
+'''
+
+from __future__ import print_function
+
+from gkeygen.cli import Main
+
+import os
+import sys
+
+
+# This block ensures that ^C interrupts are handled quietly.
+try:
+    import signal
+
+    def exithandler(signum,frame):
+        signal.signal(signal.SIGINT, signal.SIG_IGN)
+        signal.signal(signal.SIGTERM, signal.SIG_IGN)
+        print()
+        sys.exit(1)
+
+    signal.signal(signal.SIGINT, exithandler)
+    signal.signal(signal.SIGTERM, exithandler)
+    signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+
+except KeyboardInterrupt:
+    print()
+    sys.exit(1)
+
+root = None
+if 'ROOT' in os.environ:
+    root = os.environ['ROOT']
+
+main = Main(root=root)
+success = main()
+
+# exit is boolean opposite normal True/False
+sys.exit(not success)
diff --git a/gkeys-gen/gkeygen/actions.py b/gkeys-gen/gkeygen/actions.py
index 8f8c81a..2c1467e 100644
--- a/gkeys-gen/gkeygen/actions.py
+++ b/gkeys-gen/gkeygen/actions.py
@@ -35,7 +35,7 @@ Action_Map = OrderedDict({
         'options': ['spec', 'dest'],
         'desc': '''Generate a gpg key using a spec file''',
         'long_desc': '''Generate a gpg key using a spec file''',
-        'example': '''$ gkey-gen gen-key
+        'example': '''$ gkeys-gen gen-key
 
     GPG key creator
         Spec file..: glep-63-recommended
@@ -91,7 +91,7 @@ Continue?[y/n]: y
         'desc': '''List spec file definitions (spec names) found in the config''',
         'long_desc': '''List spec file definitions (spec names) found in the config.
     The default-spec setting when the pkg was installed is set to glep-63-recommended.''',
-        'example': '''$ gkey-gen list-specs
+        'example': '''$ gkeys-gen list-specs
 
  Gkey task results:
     Specs defined: glep-63,  default-spec,  glep-63-recommended
diff --git a/gkeys-gen/setup.py b/gkeys-gen/setup.py
index 5fae8f4..2772732 100755
--- a/gkeys-gen/setup.py
+++ b/gkeys-gen/setup.py
@@ -55,7 +55,7 @@ class build_man(Command):
         basepath = os.path.dirname(__file__)
         docpath = os.path.join(basepath, 'doc')
         templatepath = os.path.dirname(manpages.__file__)
-        man = manpages.ManPage('gkey-gen', __version__, None,
+        man = manpages.ManPage('gkeys-gen', __version__, None,
             docpath, Gkeys_Map['authors'])
         man.read_template(templatepath, 'command.template')
         man.make_prog(Gkeys_Map)
@@ -84,7 +84,7 @@ setup(
     url="https://wiki.gentoo.org/wiki/Project:Gentoo-keys",
     download_url='',
     packages=['gkeygen'],
-    scripts=['bin/gkey-gen'],
+    scripts=['bin/gkeys-gen'],
     data_files=[
         (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'etc/gkeys/'), ['etc/gkeys-gen.conf']),
         (os.path.join(os.sep, EPREFIX.lstrip(os.sep), 'usr/share/man/man1'), glob('doc/*')),
-- 
cgit v1.2.3-65-gdbad