Merge pull request #3 from kodguru/handle_tabs_values

anders-larsson · web-flow · commit d37daa54cde8 · 2023-12-12T12:42:27.000Z
Handle tab-separated values better
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -100,7 +100,7 @@
       $qvalue = shellquote("${value}")
       # lint:endignore
       exec { "enforce-sysctl-value-${qtitle}":
-        unless  => "test \"$(sysctl -n ${qtitle})\" = ${qvalue}",
+        unless  => "test \"$(sysctl -n ${qtitle} | tr -s '[ \t]' ' ')\" = ${qvalue}",
         command => "sysctl -w ${qtitle}=${qvalue}",
         path    => ['/usr/sbin', '/sbin', '/usr/bin', '/bin'],
       }
diff --git a/spec/defines/init_spec.rb b/spec/defines/init_spec.rb
@@ -59,7 +59,7 @@
 
       it do
         is_expected.to contain_exec('enforce-sysctl-value-net.ipv4.ip_forward').only_with(
-          unless:  'test "$(sysctl -n net.ipv4.ip_forward)" = ""',
+          unless:  "test \"$(sysctl -n net.ipv4.ip_forward | tr -s '[ \t]' ' ')\" = \"\"",
           command: 'sysctl -w net.ipv4.ip_forward=""',
           path:    ['/usr/sbin', '/sbin', '/usr/bin', '/bin'],
         )
@@ -99,7 +99,7 @@
 
         it do
           is_expected.to contain_exec('enforce-sysctl-value-net.ipv4.ip_forward').only_with(
-            unless:  'test "$(sysctl -n net.ipv4.ip_forward)" = 1',
+            unless:  "test \"$(sysctl -n net.ipv4.ip_forward | tr -s '[ \t]' ' ')\" = 1",
             command: 'sysctl -w net.ipv4.ip_forward=1',
             path:    ['/usr/sbin', '/sbin', '/usr/bin', '/bin'],
           )

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@`
`100`	`100`	`$qvalue = shellquote("${value}")`
`101`	`101`	`# lint:endignore`
`102`	`102`	`exec { "enforce-sysctl-value-${qtitle}":`
`103`		`- unless => "test \"$(sysctl -n ${qtitle})\" = ${qvalue}",`
	`103`	`+ unless => "test \"$(sysctl -n ${qtitle} \| tr -s '[ \t]' ' ')\" = ${qvalue}",`
`104`	`104`	`command => "sysctl -w ${qtitle}=${qvalue}",`
`105`	`105`	`path => ['/usr/sbin', '/sbin', '/usr/bin', '/bin'],`
`106`	`106`	`}`