mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] rootfs: Fix handling of empty variables
Date: Tue,  2 Feb 2021 15:58:36 +0100	[thread overview]
Message-ID: <20210202145836.28983-1-s.hauer@pengutronix.de> (raw)

$(PTXCONF_PROJECT_VENDOR) and $(PTXCONF_ROOTFS_ETC_HOSTNAME) can be
empty variables in which case bash answers with:

/bin/bash: command substitution: line 0: syntax error near unexpected token `newline'
/bin/bash: command substitution: line 0: `sed -r 's/ ?([\.:;,]) ?/ \1 /' <<< '

Fix this warning by putting the variables into quotation marks to make
the empty string explicit.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 rules/rootfs.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/rootfs.make b/rules/rootfs.make
index 419ca001e..627d33463 100644
--- a/rules/rootfs.make
+++ b/rules/rootfs.make
@@ -217,11 +217,11 @@ ifdef PTXCONF_ROOTFS_ISSUE
 		$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_HOSTNAME)))
 	@$(call install_replace_figlet, rootfs, /etc/issue, \
 		@FIGLET:VENDOR@, \
-		`sed -r 's/ ?([\.:;,]) ?/ \1 /' <<< $(PTXCONF_PROJECT_VENDOR)`, \
+		`sed -r 's/ ?([\.:;,]) ?/ \1 /' <<< "$(PTXCONF_PROJECT_VENDOR)"`, \
 		etcissue)
 	@$(call install_replace_figlet, rootfs, /etc/issue, \
 		@FIGLET:HOSTNAME@, \
-		`sed -r 's/ ?([\.:;,]) ?/ \1 /' <<< $(PTXCONF_ROOTFS_ETC_HOSTNAME)`, \
+		`sed -r 's/ ?([\.:;,]) ?/ \1 /' <<< "$(PTXCONF_ROOTFS_ETC_HOSTNAME)"`, \
 		etcissue)
 endif
 
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

             reply	other threads:[~2021-02-02 14:58 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-02 14:58 Sascha Hauer [this message]
2021-02-03  7:10 ` Michael Olbrich
2021-02-03  7:23   ` Sascha Hauer
2021-02-03  7:28     ` Michael Olbrich

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=20210202145836.28983-1-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /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