From a51e7b5664d0bc35d2fa00f7171d88ed0877cf4a Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Tue, 20 Oct 2015 00:44:46 +0300
Subject: lint fixes for gnupg

---
 modules/gnupg/manifests/keys.pp | 10 +++++-----
 modules/gnupg/templates/batch   |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/gnupg/manifests/keys.pp b/modules/gnupg/manifests/keys.pp
index 948619a2..a9187137 100644
--- a/modules/gnupg/manifests/keys.pp
+++ b/modules/gnupg/manifests/keys.pp
@@ -14,8 +14,8 @@ define gnupg::keys($email,
                    $keydir = '/var/lib/signbot/keys') {
 
     include gnupg::client
-    file { "$name.batch":
-        path    => "$batchdir/$name.batch",
+    file { "${name}.batch":
+        path    => "${batchdir}/${name}.batch",
         content => template('gnupg/batch')
     }
 
@@ -30,9 +30,9 @@ define gnupg::keys($email,
         owner  => $login,
     }
 
-    exec { "/usr/local/bin/create_gnupg_keys.sh $batchdir/$name.batch $keydir $batchdir/$name.done":
+    exec { "/usr/local/bin/create_gnupg_keys.sh ${batchdir}/${name}.batch ${keydir} ${batchdir}/${name}.done":
         user    => $login,
-        creates => "$batchdir/$name.done",
-        require => [File[$keydir], File["$batchdir/$name.batch"], Package['rng-utils']],
+        creates => "${batchdir}/${name}.done",
+        require => [File[$keydir], File["${batchdir}/${name}.batch"], Package['rng-utils']],
     }
 }
diff --git a/modules/gnupg/templates/batch b/modules/gnupg/templates/batch
index 4dff44eb..f4be84d9 100644
--- a/modules/gnupg/templates/batch
+++ b/modules/gnupg/templates/batch
@@ -6,4 +6,3 @@ Name-Email: <%= email %>
 Expire-Date: <%= expire_date %>
 %commit
 %echo done
-
-- 
cgit v1.2.1