From f04c05d3432cc8f59c28ce98c17dd407d658c5b6 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 26 Apr 2014 19:59:47 -0300
Subject: Newkeys: more flexibility for single node generation

---
 share/hydra/newkeys | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/hydra/newkeys b/share/hydra/newkeys
index 3f04311..c418f5c 100755
--- a/share/hydra/newkeys
+++ b/share/hydra/newkeys
@@ -26,11 +26,11 @@ function hydra_newkeys {
     if [ "$1" == "all" ]; then
       hydra_genpairs
     elif [ "$1" == "all-ssh" ]; then
-      hydra_genpairs all-ssh
+      hydra_genpairs ssh
     elif [ "$1" == "all-pgp" ]; then
-      hydra_genpairs all-pgp
+      hydra_genpairs pgp
     elif [ ! -z "$1" ]; then
-      hydra_genpairs
+      hydra_genpairs $2
       exit $?
     elif [ ! -e "$privkey" ] || [ ! -e "$pubkey" ]; then
       hydra_genpairs
@@ -41,11 +41,11 @@ function hydra_newkeys {
 function hydra_genpairs {
   BASEDIR="/tmp"
 
-  if [ "$1" != "all-pgp" ]; then
+  if [ "$1" != "pgp" ]; then
     keyringer $HYDRA genpair ssh $node/ssh/id_rsa $host $privkey
   fi
 
-  if [ "$1" != "all-ssh" ]; then
+  if [ "$1" != "ssh" ]; then
     keyringer $HYDRA genpair gpg $node/gpg/key    $host
   fi
 
-- 
cgit v1.2.3