Merge pull request #278 from jhoblitt/maint/remove-unnecessary-whites…

…pace remove unnecessary whitespace from $::jenkins::cli_helper::helper_cmd
voxpupuli · May 2, 2015 · 7133ab3 · 7133ab3
2 parents 576a63c + 283055a
commit 7133ab3
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/manifests/cli_helper.pp b/manifests/cli_helper.pp
@@ -24,13 +24,16 @@
   if $ssh_keyfile {
     $auth_arg = "-i ${ssh_keyfile}"
   } else {
-    $auth_arg = ''
+    $auth_arg = undef
   }
-  $helper_cmd = join([
-    '/usr/bin/java',
-    "-jar ${::jenkins::cli::jar}",
-    "-s http://127.0.0.1:${port}",
-    $auth_arg,
-    "groovy ${helper_groovy}",
-  ], ' ')
+  $helper_cmd = join(
+    delete_undef_values([
+      '/usr/bin/java',
+      "-jar ${::jenkins::cli::jar}",
+      "-s http://127.0.0.1:${port}",
+      $auth_arg,
+      "groovy ${helper_groovy}",
+    ]),
+    ' '
+  )
 }