From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/3] initscripts: readhash: Only strip quotes if they exist
Date: Fri, 06 Dec 2024 16:42:16 +0000 [thread overview]
Message-ID: <20241206164217.3840140-2-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20241206164217.3840140-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 836 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
src/initscripts/system/functions | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/initscripts/system/functions b/src/initscripts/system/functions
index 125aa1dc6..094e35495 100644
--- a/src/initscripts/system/functions
+++ b/src/initscripts/system/functions
@@ -899,7 +899,6 @@ readhash() {
local line
while read -r line; do
-
# Skip Blank Lines
if [[ ${line} =~ ^[[:space:]]*$ ]]; then
continue
@@ -932,8 +931,12 @@ readhash() {
fi
# strip leading and trailing single quotes
- val="${val#\'}"
- val="${val%\'}"
+ case "${val}" in
+ '*')
+ val="${val#\'}"
+ val="${val%\'}"
+ ;;
+ esac
printf -v "${array}[${key}]" "%s" "${val}"
done < "${file}"
--
2.39.5
next prev parent reply other threads:[~2024-12-06 16:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-06 16:42 [PATCH 1/3] tests: Fix path to bash Michael Tremer
2024-12-06 16:42 ` Michael Tremer [this message]
2024-12-06 16:42 ` [PATCH 3/3] initscripts: readhash: Fix handling = signs Michael Tremer
2024-12-19 18:16 ` Jonatan Schlag
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241206164217.3840140-2-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox