X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/069e33163e0b09a7d647a98c2fde284a16a43b99..f30f230da23603e3c7598205219ce01e9820c470:/cookbooks/nodejs/providers/package.rb diff --git a/cookbooks/nodejs/providers/package.rb b/cookbooks/nodejs/providers/package.rb index 5e3ca0684..4c852732f 100644 --- a/cookbooks/nodejs/providers/package.rb +++ b/cookbooks/nodejs/providers/package.rb @@ -27,28 +27,26 @@ def load_current_resource @current_resource = Chef::Resource::NodejsPackage.new(new_resource.name) @current_resource.package_name(new_resource.package_name) - if package = @packages[@current_resource.package_name] + if (package = @packages[@current_resource.package_name]) @current_resource.version(package["version"]) end @current_resource end action :install do - if new_resource.version - package_name = "#{new_resource.package_name}@#{new_resource.version}" - else - package_name = new_resource.package_name - end + package_name = if new_resource.version + "#{new_resource.package_name}@#{new_resource.version}" + else + new_resource.package_name + end if !@packages.include?(new_resource.package_name) shell_out!("npm install --global #{package_name}") new_resource.updated_by_last_action(true) - else - if new_resource.version && - new_resource.version != @current_resource.version - shell_out!("npm install --global #{package_name}") - new_resource.updated_by_last_action(true) - end + elsif new_resource.version && + new_resource.version != @current_resource.version + shell_out!("npm install --global #{package_name}") + new_resource.updated_by_last_action(true) end end