shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

F #3380: add zeromq devel package to install gems (#3712)

Browse Source 
* Add zeromq devel package to install gems
* Error cond. checks in install_gems
This commit is contained in:
Alejandro Huertas Herrero 2019-09-16 18:07:48 +02:00 committed by Tino Vázquez
parent bbde2f91c5
commit efb41f8552
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
share/install_gems/install_gems
View File

@ -6,7 +6,7 @@ ENV['PATH'] += ENV['PATH'] + ':/usr/local/bin'
require 'pp'
DEFAULT_PRE=%w{sunstone quota cloud auth_ldap vmware oneflow ec2_hybrid oca onedb market}
DEFAULT_PRE=%w{sunstone quota cloud auth_ldap vmware oneflow ec2_hybrid oca onedb market hooks}
if defined?(RUBY_VERSION) && RUBY_VERSION>="1.8.7"
SQLITE='sqlite3'
@ -46,7 +46,8 @@ GROUPS={
:ec2_hybrid => 'aws-sdk --version "~> 2.5"',
:oca => 'ox',
:market => 'aws-sdk',
:onedb => "mysql2"
:onedb => "mysql2",
:hooks => "zeromq"
}
PACKAGES=GROUPS.keys
@ -67,7 +68,8 @@ DISTRIBUTIONS={
$nokogiri => %w{gcc rake libxml2-dev libxslt1-dev patch},
'xmlparser' => ['gcc', 'libexpat1-dev'],
'thin' => ['g++'],
'json' => ['gcc']
'json' => ['gcc'],
'zeromq' => ['gcc', 'libzmq5', 'libzmq3-dev']
},
:install_command_interactive => 'apt-get install',
:install_command => 'apt-get -y install',
@ -86,7 +88,8 @@ DISTRIBUTIONS={
$nokogiri => %w{gcc rubygem-rake libxml2-devel libxslt-devel patch},
'xmlparser' => ['gcc', 'expat-devel'],
'thin' => ['gcc-c++'],
'json' => ['gcc']
'json' => ['gcc'],
'zeromq' => ['gcc', 'zeromq', 'zeromq-devel']
},
:install_command_interactive => 'yum install',
:install_command => 'yum -y install',
@ -306,9 +309,9 @@ def get_dependencies(gems, dependencies, check_command)
alt_pkg = nil
pkg.each do |p|
`#{check_command} #{p} 2>/dev/null`
out = `#{check_command} #{p} 2>/dev/null`
if $?.exitstatus==0
if $?.exitstatus==0 && !out.empty?
alt_pkg = p
break
end
@ -371,7 +374,12 @@ def install_dependencies(gems, distro)
command=install_command+" " << deps.join(' ')
puts command
system command
rc = system command
if !rc
STDERR.puts 'Error installing dependencies'
exit(-1)
end
end
end