diff --git a/manifests/system.pp b/manifests/system.pp index e064206d..25083895 100644 --- a/manifests/system.pp +++ b/manifests/system.pp @@ -13,17 +13,6 @@ default => $version, } - # curl needs to be installed - if ! defined(Package['curl']) { - case $facts['kernel'] { - 'Linux': { - ensure_packages(['curl']) - Package['curl'] -> Exec['system-rvm'] - } - default: {} - } - } - $http_proxy_environment = $proxy_url ? { undef => [], default => ["http_proxy=${proxy_url}", "https_proxy=${proxy_url}"] @@ -74,11 +63,14 @@ } } else { + ensure_packages(['curl']) + exec { 'system-rvm': path => '/usr/bin:/usr/sbin:/bin:/usr/local/bin', command => "curl -fsSL https://get.rvm.io | bash -s -- --version ${actual_version}", creates => '/usr/local/rvm/bin/rvm', environment => $environment, + require => Package['curl'], } }