[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-gen/, gkeys/etc/, gkeys-gen/gkeygen/, gkeys-gen/bin/

[gentoo-commits] proj/gentoo-keys:master commit in: gkeys-gen/, gkeys/etc/, gkeys-gen/gkeygen/, gkeys-gen/bin/

[Brian Dolbec]

commit:     b04153d6d401a9e9bbc0aebc4bbec3e0021fe4ec
Author:     Pavlos Ratis <dastergon <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  8 20:42:20 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Jan  8 20:44:50 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=b04153d6

Rename gkey-gen to gkeys-gen for consistency

---
 gkeys-gen/bin/{gkey-gen => gkeys-gen} | 0
 gkeys-gen/gkeygen/actions.py          | 4 ++--
 gkeys-gen/setup.py                    | 4 ++--
 gkeys/etc/gkeys.conf                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gkeys-gen/bin/gkey-gen b/gkeys-gen/bin/gkeys-gen
similarity index 100%
rename from gkeys-gen/bin/gkey-gen
rename to gkeys-gen/bin/gkeys-gen

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/*')),

diff --git a/gkeys/etc/gkeys.conf b/gkeys/etc/gkeys.conf
index 19f843a..7a774be 100644
--- a/gkeys/etc/gkeys.conf
+++ b/gkeys/etc/gkeys.conf
@@ -74,7 +74,7 @@ gentoo-devs: %(seedsdir)s/gentoo-devs.seeds
 # Add sign here for ability to choose as a category
 # but leave the value blank to prevent accidental changes
 # this subdir directory is where you would copy your gpghome directories to
-# after creating your key with gkey-gen. Name them the same as the nick you use.
+# after creating your key with gkeys-gen. Name them the same as the nick you use.
 #sign: