Handle lense_dir based on $::rubysitedir. (#87)

Fixes: #65
voxpupuli · Aug 27, 2021 · 1ff219f · 1ff219f
1 parent a418f23
commit 1ff219f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -50,7 +50,7 @@
     default:  { fail("Unsupported OS family: ${facts['os']['family']}") }
   }
 
-  if versioncmp($::puppetversion, '4.0.0') >= 0 {
+  if (versioncmp($::puppetversion, '4.0.0') >= 0) and ($::rubysitedir =~ /\/opt\/puppetlabs\/puppet/) {
     $lens_dir = '/opt/puppetlabs/puppet/share/augeas/lenses'
   } elsif (defined('$is_pe') and str2bool("${::is_pe}")) { # lint:ignore:only_variable_string
     # puppet enterpise has a different lens location

diff --git a/spec/classes/augeas_spec.rb b/spec/classes/augeas_spec.rb
@@ -14,7 +14,11 @@
     end
   end
 
-  lens_dir = (Puppet.version < '4.0.0') ? '/usr/share/augeas/lenses' : '/opt/puppetlabs/puppet/share/augeas/lenses'
+  if Puppet.version >= '4.0.0' and facts[:rubysitedir] =~ /\/opt\/puppetlabs\/puppet/
+    lens_dir = '/opt/puppetlabs/puppet/share/augeas/lenses'
+  else
+    lens_dir = '/usr/share/augeas/lenses'
+  end
 
   on_supported_os.each do |os, facts|
     context "on #{os}" do

diff --git a/spec/defines/augeas_lens_spec.rb b/spec/defines/augeas_lens_spec.rb
@@ -3,7 +3,11 @@
 describe 'augeas::lens' do
   let(:title) { 'foo' }
 
-  lens_dir = (Puppet.version < '4.0.0') ? '/usr/share/augeas/lenses' : '/opt/puppetlabs/puppet/share/augeas/lenses'
+  if Puppet.version >= '4.0.0' and facts[:rubysitedir] =~ /\/opt\/puppetlabs\/puppet/
+    lens_dir = '/opt/puppetlabs/puppet/share/augeas/lenses'
+  else
+    lens_dir = '/usr/share/augeas/lenses'
+  end
 
   context 'when declaring augeas class first' do
     on_supported_os.each do |os, facts|