From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 13/21] initscript fkt: ignore blank lines in readhash
Date: Mon, 03 Jun 2024 10:21:02 +0100
Message-ID: <8FD78FB3-A13F-4AE5-AB55-949B4724FDE7@ipfire.org>
In-Reply-To: <7c93843e3978ecf281af842ae94220a678a49ce6.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7475610795849847860=="
List-Id: <development.lists.ipfire.org>

--===============7475610795849847860==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Your tests I didn=E2=80=99t understand at all. You need to structure those in=
 a more simple way.

> On 2 Jun 2024, at 19:07, Jonatan Schlag <jonatan.schlag(a)ipfire.org> wrote:
>=20
> Hi,
>=20
>=20
> Am Freitag, dem 31.05.2024 um 10:55 +0100 schrieb Michael Tremer:
>>=20
>>=20
>>> On 20 May 2024, at 10:06, Jonatan Schlag
>>> <jonatan.schlag(a)ipfire.org> wrote:
>>>=20
>>> Signed-off-by: Jonatan Schlag <jonatan.schlag(a)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
>>>=20
>>> 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() {
>>>=20
>>> local line
>>> while read -r line; do
>>> +
>>> + # Skip Blank Lines
>>> + if [[ ${line} =3D~ ^[[:space:]]*$ ]]; then
>>> + continue
>>> + fi
>>> +
>>> local key=3D"${line%=3D*}"
>>> local val=3D"${line#*=3D}"
>>=20
>> I don=E2=80=99t think this is quite sufficient.
>>=20
>> You might have other lines that are invalid. For example =E2=80=9C=3DVALUE=
=E2=80=9D. I
>> think we should check that key isn=E2=80=99t empty, and we should limit wh=
at
>> characters can be used in keys and values as it used to be before in
>> the script.
>>=20
>> https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dblob;f=3Dsrc/scripts/readha=
sh;h=3Dbffc93fbd00c31a76e9c96fc17dabf0a87c3c9ef;hb=3DHEAD
>>=20
> Hi,
>=20
> I will merge all commits for checks in the next series. There are more
> checks to come. In a later commit, I check for correct values and keys.
>=20
> Jonatan
>>>=20
>>> 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 ec502e199..8d644b8cd 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_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_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"
>>> --=20
>>> 2.39.2



--===============7475610795849847860==--