Skip to content

Commit 37f069d

Browse files
authored
Merge pull request #89 from OpenVoxProject/openbolt_ruby_dirs
Add ruby directories to openbolt-runtime
2 parents 7a92510 + 6fa8148 commit 37f069d

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

configs/projects/openbolt-runtime.rb

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,19 @@
3535
proj.setting(:prefix, '/opt/puppetlabs/bolt')
3636
end
3737

38+
ruby_base_version = proj.ruby_version.gsub(/(\d+)\.(\d+)(\.\d+)?/, '\1.\2.0')
39+
3840
proj.setting(:ruby_dir, proj.prefix)
3941
proj.setting(:bindir, File.join(proj.prefix, 'bin'))
4042
proj.setting(:ruby_bindir, proj.bindir)
4143
proj.setting(:libdir, File.join(proj.prefix, 'lib'))
4244
proj.setting(:includedir, File.join(proj.prefix, 'include'))
4345
proj.setting(:datadir, File.join(proj.prefix, 'share'))
4446
proj.setting(:mandir, File.join(proj.datadir, 'man'))
47+
proj.setting(:ruby_dir_base, File.join(proj.libdir, 'ruby'))
48+
proj.setting(:ruby_dir_base_version, File.join(proj.ruby_dir_base, ruby_base_version))
49+
proj.setting(:rubygems_dir, File.join(proj.ruby_dir_base_version, 'rubygems'))
50+
proj.setting(:rubygems_ssl_dir, File.join(proj.rubygems_dir, 'ssl_certs'))
4551

4652
if platform.is_windows?
4753
proj.setting(:host_ruby, File.join(proj.ruby_bindir, 'ruby.exe'))
@@ -55,8 +61,6 @@
5561
proj.setting(:host_gem, File.join(proj.ruby_bindir, 'gem'))
5662
end
5763

58-
ruby_base_version = proj.ruby_version.gsub(/(\d+)\.(\d+)(\.\d+)?/, '\1.\2.0')
59-
6064
proj.setting(:gem_home, File.join(proj.libdir, 'ruby', 'gems', ruby_base_version))
6165
proj.setting(:gem_install, "#{proj.host_gem} install --no-document --local --bindir=#{proj.ruby_bindir}")
6266

@@ -287,6 +291,10 @@
287291
proj.directory proj.includedir
288292
proj.directory proj.datadir
289293
proj.directory proj.mandir
294+
proj.directory proj.ruby_dir_base
295+
proj.directory proj.ruby_dir_base_version
296+
proj.directory proj.rubygems_dir
297+
proj.directory proj.rubygems_ssl_dir
290298

291299
# Export the settings for the current project and platform as yaml during builds
292300
proj.publish_yaml_settings

0 commit comments

Comments
 (0)