Merge pull request #78 from edestecd/ignore_gpg

Use which to test for gpg2
voxpupuli · Feb 5, 2015 · db5dbb0 · db5dbb0
2 parents 729b317 + 2d62ec2
commit db5dbb0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/manifests/system.pp b/manifests/system.pp
@@ -35,11 +35,11 @@
 
   # ignore gpg check if it is not installed, same as rvm does
   exec { 'system-rvm-gpg-key':
-    command     => 'gpg2 --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3',
+    command     => 'which gpg2 && gpg2 --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3',
     path        => $::path,
     environment => $environment,
-    unless      => 'gpg2 --list-keys D39DC0E3',
-    onlyif      => ['gpg2 --version'],
+    unless      => 'which gpg2 && gpg2 --list-keys D39DC0E3',
+    onlyif      => 'which gpg2',
   } ->
 
   exec { 'system-rvm':