From 017902425baf92fd7b60dfc6a421011c95faa523 Mon Sep 17 00:00:00 2001
From: Anders Larsson <anders.x.larsson@ericsson.com>
Date: Tue, 12 Dec 2023 10:54:16 +0100
Subject: [PATCH] Handle tab-separated values better

---
 manifests/init.pp         | 2 +-
 spec/defines/init_spec.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index a256bc6..0d29412 100644
--- 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
index b7eac14..419cc06 100644
--- 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'],
           )