Merge pull request #204 from GeoffWilliams/windows_case_fix

fix concat broken on windows due to case sensitive regexp -- fixes MODULES-1203
This commit is contained in:
Joshua Hoblitt 2014-07-08 20:59:25 -07:00
commit db8944a0ba
2 changed files with 5 additions and 5 deletions

View file

@ -31,8 +31,8 @@ class concat::setup {
# this goes smoothly, we should move towards completely eliminating the .sh
# version.
$script_name = $::osfamily? {
/(Windows|Solaris)/ => 'concatfragments.rb',
default => 'concatfragments.sh'
/(?i:(Windows|Solaris))/ => 'concatfragments.rb',
default => 'concatfragments.sh'
}
$script_path = "${concatdir}/bin/${script_name}"

View file

@ -61,12 +61,12 @@ describe 'concat::setup', :type => :class do
end
end # on osfamily Solaris
context "on osfamily Windows" do
context "on osfamily windows" do
concatdir = '/foo'
let(:facts) do
{
:concat_basedir => concatdir,
:osfamily => 'Windows',
:osfamily => 'windows',
:id => 'batman',
}
end
@ -80,5 +80,5 @@ describe 'concat::setup', :type => :class do
:backup => false,
})
end
end # on osfamily Windows
end # on osfamily windows
end