From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: development@lists.ipfire.org Subject: [PATCH 20/21] initscripts fkt: keep readhash compatible with older implementation Date: Mon, 20 May 2024 11:06:10 +0200 Message-ID: <20240520090611.10406-21-jonatan.schlag@ipfire.org> In-Reply-To: <20240520090611.10406-1-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3410990127340494016==" List-Id: --===============3410990127340494016== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable With the use of eval BLUE_DEV=3D'blue0 net0' stored "blue0 net0" in the variable BLUE_DEV not "'blue0 net0'" Signed-off-by: Jonatan Schlag --- src/initscripts/system/functions | 4 ++++ tests/src/initscripts/system/functions/test.sh | 1 + 2 files changed, 5 insertions(+) diff --git a/src/initscripts/system/functions b/src/initscripts/system/functi= ons index c9c4c0675..6d72e4119 100644 --- a/src/initscripts/system/functions +++ b/src/initscripts/system/functions @@ -932,6 +932,10 @@ readhash() { continue fi =20 + # strip leading and trailing single quotes + val=3D"${val#\'}" + val=3D"${val%\'}" + printf -v "${array}[${key}]" "%s" "${val}" done < "${file}" } diff --git a/tests/src/initscripts/system/functions/test.sh b/tests/src/inits= cripts/system/functions/test.sh index 9981cc732..1a715d7d9 100755 --- a/tests/src/initscripts/system/functions/test.sh +++ b/tests/src/initscripts/system/functions/test.sh @@ -14,6 +14,7 @@ readhash "CONFIG" "${SCRIPT_PATH}/data/1" # test if we read the correct data test_that_key_in_arry_has_value "CONFIG" "RED_DHCP_HOSTNAME" "ipfire" test_that_key_in_arry_has_value "CONFIG" "BLUE_MACADDR" "bc:30:7d:58:6b:e3" +test_that_key_in_arry_has_value "CONFIG" "BLUE_DEV" "blue0 net0" =20 # Test that comments are skipped # apparently the way we read the file strips the whitespace, so the key does= not contain any whitespace either --=20 2.39.2 --===============3410990127340494016==--