From ce27aa2035b43bddca948973a7e2fc3469f45e9d Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Tue, 9 Nov 2010 14:07:26 -0700 Subject: [PATCH] Use .member? instead of .none? for older ruby --- tasks/lib.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tasks/lib.rb b/tasks/lib.rb index 9c530186..99036e6f 100644 --- a/tasks/lib.rb +++ b/tasks/lib.rb @@ -50,7 +50,7 @@ def package_dep opts distro = detect_distro() distros = opts.delete :distros - if distros && distros.none?{|x| x == distro[0]} + if distros && !distros.member?(distro[0]) puts "#{distro[0]} does not need #{opts.inspect}" return "/" # Return a file dependency that will presumably always work. end @@ -69,17 +69,17 @@ def package_dep opts case distro[0] when :ubuntu, :debian installed = `dpkg --list`.split("\n").map { |x| x.split[1] } # Hm, this is out of scope if defined outside. - if installed.none? { |pkg| pkg == package } + if !installed.member?(package) sh "sudo apt-get -y install #{package}" end when :solaris installed = `pkg-get -l`.split("\n") - if installed.none? { |pkg| pkg == package } + if !installed.member?(package) sh "sudo pkg-get install #{package}" end when :osx installed = `brew list`.split("\n") - if installed.none? { |pkg| pkg == package } + if !installed.member?(package) sh "sudo brew install #{package}" end else