MISC: Clean up code for managing the packages.

BUG: Ensure absent works the same as before.

Author: JohnEricson

manifests/cli.pp

@@ -45,35 +45,29 @@
 }
 }
 elsif 'absent' == $ensure {
-file { "${wp::bin_path}/":
+file { "${wp::bin_path}/${wp::executable_filename}":
 ensure => absent,
 }
 file { '/usr/local/src/wp-cli':
 ensure => absent,
 }
 }
 
-if $manage_php_package {
-if ! defined( Package[ $::wp::php_package ] ) {
-package { $::wp::php_package:
-ensure => installed,
-}
+if $manage_php_package and ! defined( Package[ $::wp::php_package ] ) {
+package { $::wp::php_package:
+ensure => installed,
 }
 }
 
-if $manage_curl_package {
-if ! defined(Package['curl']) {
-package { 'curl':
-ensure => installed,
-}
+if $manage_curl_package and ! defined(Package['curl']) {
+package { 'curl':
+ensure => installed,
 }
 }
 
-if $manage_git_package {
-if ! defined(Package['git']) {
-package { 'git':
-ensure => installed,
-}
+if $manage_git_package and ! defined(Package['git']) {
+package { 'git':
+ensure => installed,
 }
 }
 }