From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
In-Reply-To: <20210203081236.25228-1-s.hauer@pengutronix.de>
MIME-Version: 1.0
Message-Id: <E1l7uws-007w8w-HB@dude03.red.stw.pengutronix.de>
From: Michael Olbrich <mol@pengutronix.de>
Date: Fri, 05 Feb 2021 07:50:34 +0100
Subject: Re: [ptxdist] [APPLIED] rootfs: Fix handling of empty variables
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de

Thanks, applied as e036dee4b718fef1c07b7313b2560a2494b3cc7a.

Michael

[sent from post-receive hook]

On Fri, 05 Feb 2021 07:50:34 +0100, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> $(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 adding quotes to make the empty string explicit.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Message-Id: <20210203081236.25228-1-s.hauer@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/rootfs.make b/rules/rootfs.make
> index 419ca001e4ac..1c1e5501cf83 100644
> --- a/rules/rootfs.make
> +++ b/rules/rootfs.make
> @@ -217,12 +217,14 @@ 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)`, \
> -		etcissue)
> +		`sed -r 's/ ?([\.:;,]) ?/ \1 /' <<< \
> +			"$(call remove_quotes,$(PTXCONF_PROJECT_VENDOR))"`, \
> +			etcissue)
>  	@$(call install_replace_figlet, rootfs, /etc/issue, \
>  		@FIGLET:HOSTNAME@, \
> -		`sed -r 's/ ?([\.:;,]) ?/ \1 /' <<< $(PTXCONF_ROOTFS_ETC_HOSTNAME)`, \
> -		etcissue)
> +		`sed -r 's/ ?([\.:;,]) ?/ \1 /' <<< \
> +			"$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_HOSTNAME))"`, \
> +			etcissue)
>  endif
>  
>  ifdef PTXCONF_ROOTFS_HOSTS

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