diff mbox series

[v2,11/18] initscript fkt: ignore blank lines in readhash

Message ID	20240616160245.18865-12-jonatan.schlag@ipfire.org
State	New
Headers	From: Jonatan Schlag <jonatan.schlag@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH v2 11/18] initscript fkt: ignore blank lines in readhash Date: Sun, 16 Jun 2024 18:02:38 +0200 Message-Id: <20240616160245.18865-12-jonatan.schlag@ipfire.org> In-Reply-To: <20240616160245.18865-1-jonatan.schlag@ipfire.org> References: <20240616160245.18865-1-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: TFYYEBKWLJXRS4R2XYB3UDUEX3FWSBGS Precedence: list Archived-At: <https://lists.ipfire.org/hyperkitty/list/development@lists.ipfire.org/message/TFYYEBKWLJXRS4R2XYB3UDUEX3FWSBGS/>
Series	[v2,01/18] tests: Add bash lib \| [v2,01/18] tests: Add bash lib [v2,02/18] tests/lib.sh: Add function test_value_in_array [v2,03/18] tests/lib.sh: Add check if variable exists to test_value_in_array [v2,04/18] tests/lib.sh: Add logging functions [v2,05/18] tests/lib.sh: adjust to pytest logging style [v2,06/18] test_value_in_array: Check if the key is defined [v2,07/18] tests: Add function to test the ouput of a bash function [v2,08/18] test: Add functions test_that_array_is_defined [v2,09/18] tests: Add functions test_that_array_doesnt_have_key [v2,10/18] initscript functions: add readhash [v2,11/18] initscript fkt: ignore blank lines in readhash [v2,12/18] initscripts fkt: Ignore comments in readhash [v2,13/18] initscripts fkt: ignore invalid keys in readhash [v2,14/18] initscripts fkt: Check for invalid values in readhash [v2,15/18] initscripts fkt: readhash should only parse lines with a = [v2,16/18] initscripts fkt: keep readhash compatible with older implementation [v2,17/18] initscripts fkt: Fix shebang [v2,18/18] initscripts fkt: Check that readhash returns 1 on a missing file

Commit Message

Jonatan Schlag June 16, 2024, 4:02 p.m. UTC

  Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---
 src/initscripts/system/functions                            | 6 ++++++
 tests/src/initscripts/system/functions/data/1_output_stderr | 0
 tests/src/initscripts/system/functions/data/1_output_stdout | 0
 tests/src/initscripts/system/functions/test.sh              | 3 +++
 4 files changed, 9 insertions(+)
 create mode 100644 tests/src/initscripts/system/functions/data/1_output_stderr
 create mode 100644 tests/src/initscripts/system/functions/data/1_output_stdout

diff mbox series

Patch

diff --git a/src/initscripts/system/functions b/src/initscripts/system/functions
index 44ce999d3..3f01be9e0 100644
--- a/src/initscripts/system/functions
+++ b/src/initscripts/system/functions
@@ -900,6 +900,12 @@  readhash() {
 
 	local line
 	while read -r line; do
+
+		# Skip Blank Lines
+		if [[ ${line} =~ ^[[:space:]]*$ ]]; then
+			continue
+		fi
+
 		local key="${line%=*}"
 		local val="${line#*=}"
 
diff --git a/tests/src/initscripts/system/functions/data/1_output_stderr b/tests/src/initscripts/system/functions/data/1_output_stderr
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/src/initscripts/system/functions/data/1_output_stdout b/tests/src/initscripts/system/functions/data/1_output_stdout
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/src/initscripts/system/functions/test.sh b/tests/src/initscripts/system/functions/test.sh
index dbb2d8a62..751be6884 100755
--- a/tests/src/initscripts/system/functions/test.sh
+++ b/tests/src/initscripts/system/functions/test.sh
@@ -14,3 +14,6 @@  readhash "CONFIG" "${SCRIPT_PATH}/data/1"
 # test if we read the correct data
 test_value_in_array "CONFIG" "RED_DHCP_HOSTNAME" "ipfire"
 test_value_in_array "CONFIG" "BLUE_MACADDR" "bc:30:7d:58:6b:e3"
+
+test_that_output_is "${SCRIPT_PATH}/data/1_output_stdout" "1" readhash "CONFIG" "${SCRIPT_PATH}/data/1"
+test_that_output_is "${SCRIPT_PATH}/data/1_output_stderr" "2" readhash "CONFIG" "${SCRIPT_PATH}/data/1"