Skip to content

Commit ba05924

Browse files
authored
Merge pull request #85 from ananace/fix-augeas
Install augeas/facade.rb for modern ruby-augeas
2 parents 1e89a20 + 0e5b37f commit ba05924

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

configs/components/ruby-augeas.rb

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,13 @@
6060
build_commands
6161
end
6262

63-
augeas_rb_target = if settings[:ruby_vendordir]
64-
File.join(settings[:ruby_vendordir], 'augeas.rb')
65-
else
66-
# If no alternate vendordir has been set, install into default
67-
# vendordir for this ruby version.
68-
File.join(settings[:ruby_dir], 'lib', 'ruby', 'vendor_ruby', 'augeas.rb')
69-
end
63+
augeas_rb_target = settings[:ruby_vendordir] if settings[:ruby_vendordir]
64+
# If no alternate vendordir has been set, install into default
65+
# vendordir for this ruby version.
66+
augeas_rb_target ||= File.join(settings[:ruby_dir], 'lib', 'ruby', 'vendor_ruby')
7067

71-
pkg.install_file 'lib/augeas.rb', augeas_rb_target
68+
pkg.install_file 'lib/augeas.rb', File.join(augeas_rb_target, 'augeas.rb')
69+
pkg.install_file 'lib/augeas/facade.rb', File.join(augeas_rb_target, 'augeas', 'facade.rb')
7270

7371
pkg.install do
7472
[

0 commit comments

Comments
 (0)