[PATCH] Support nullglob in profile.sh.in
Don't block on stdin when /etc/debuginfod/*.certpath expands to nothing. Signed-off-by: Andreas Schwab --- config/profile.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/profile.sh.in b/config/profile.sh.in index 911c7a43..5e86f433 100644 --- a/config/profile.sh.in +++ b/config/profile.sh.in @@ -11,7 +11,7 @@ if [ -z "$DEBUGINFOD_URLS" ]; then fi if [ -z "$DEBUGINFOD_IMA_CERT_PATH" ]; then -DEBUGINFOD_IMA_CERT_PATH=$(cat "@sysconfdir@/debuginfod"/*.certpath 2>/dev/null | tr '\n' ':' || :) +DEBUGINFOD_IMA_CERT_PATH=$(cat /dev/null "@sysconfdir@/debuginfod"/*.certpath 2>/dev/null | tr '\n' ':' || :) [ -n "$DEBUGINFOD_IMA_CERT_PATH" ] && export DEBUGINFOD_IMA_CERT_PATH || unset DEBUGINFOD_IMA_CERT_PATH fi unset prefix -- 2.45.0 -- Andreas Schwab, SUSE Labs, sch...@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."
Re: [PATCH] Support nullglob in profile.sh.in
On Mon, May 13, 2024 at 02:04:04PM +0200, Andreas Schwab wrote: > Don't block on stdin when /etc/debuginfod/*.certpath expands to nothing. > > Signed-off-by: Andreas Schwab > --- > config/profile.sh.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/config/profile.sh.in b/config/profile.sh.in > index 911c7a43..5e86f433 100644 > --- a/config/profile.sh.in > +++ b/config/profile.sh.in > @@ -11,7 +11,7 @@ if [ -z "$DEBUGINFOD_URLS" ]; then > fi > > if [ -z "$DEBUGINFOD_IMA_CERT_PATH" ]; then > -DEBUGINFOD_IMA_CERT_PATH=$(cat "@sysconfdir@/debuginfod"/*.certpath > 2>/dev/null | tr '\n' ':' || :) > +DEBUGINFOD_IMA_CERT_PATH=$(cat /dev/null > "@sysconfdir@/debuginfod"/*.certpath 2>/dev/null | tr '\n' ':' || :) > [ -n "$DEBUGINFOD_IMA_CERT_PATH" ] && export DEBUGINFOD_IMA_CERT_PATH || > unset DEBUGINFOD_IMA_CERT_PATH > fi > unset prefix I slightly prefer "cat
Re: [PATCH] Support nullglob in profile.sh.in
Hi - > > Don't block on stdin when /etc/debuginfod/*.certpath expands to nothing. > > Signed-off-by: Andreas Schwab Thanks, committed as obvious. > I slightly prefer "cat but this variant is also fine. I see your point, but the other five cases in the profile.* use this formulation, so for simpleminded consistency, went with the above. - FChE