[PATCH v2] config: simplify profile.*sh.in

[наб <nabijaczleweli@nabijaczleweli.xyz>]

[-- Attachment #1: Type: text/plain, Size: 3559 bytes --]

Hi!

On Tue, Jan 18, 2022 at 11:13:28AM -0500, Frank Ch. Eigler wrote:
> You mean "prefix=@prefix@".  And it's not needless,
> because @sysconfdir@ often expands to "$prefix/something",
> which requires a prefix var to be set for evaluation.
I did, and yeah, that's right. Guess it was so outlandish that I
completely missed it. Dropped.

> > 2. Simplify needless sh -c "cat glob 2>/dev/null"
> >    into cat glob 2>/dev/null
> This is not needless, but I forget the exact details.  It probably has
> to do with the $prefix expansion just above, or perhaps glob
> non-matching error handling.
Well, no, as-written, it is needless. It's also incorrect,
since it's subject to word-splitting (=> a broken glob) again.

But, yeah, turns out csh does have "glob non-matching error handing",
which is both news to me and a blast from a V3-era past.
That being said, it was also broken, because under csh
  false | cat
fails, for some inexplicable reason, and if the glob "fails",
so does cat, so so does sh.

I've restored it, in a fashion that isn't subject to re-splitting,
and actually protects -e mode, for csh.

v2 scissor-patch below.

Please keep me in CC, as I'm not subscribed,
наб

-- >8 --
1. Simplify needless sh -c "cat glob 2>/dev/null"
   into cat glob 2>/dev/null under sh
   and fix re-expansion/-e protection under csh
2. Use $( instead of ` under sh
3. Assign to D_U directly and either export it or unset it

Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
---
 config/profile.csh.in | 10 +++++-----
 config/profile.sh.in  |  9 ++-------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/config/profile.csh.in b/config/profile.csh.in
index 01f7c2f2..012e243a 100644
--- a/config/profile.csh.in
+++ b/config/profile.csh.in
@@ -1,4 +1,3 @@
-
 # $HOME/.login* or similar files may first set $DEBUGINFOD_URLS.
 # If $DEBUGINFOD_URLS is not set there, we set it from system *.url files.
 # $HOME/.*rc or similar files may then amend $DEBUGINFOD_URLS.
@@ -7,10 +6,11 @@
 
 if (! $?DEBUGINFOD_URLS) then
     set prefix="@prefix@"
-    set debuginfod_urls=`sh -c "cat @sysconfdir@/debuginfod/*.urls 2>/dev/null" | tr '\n' ' '`
-    if ( "$debuginfod_urls" != "" ) then
-        setenv DEBUGINFOD_URLS "$debuginfod_urls"
+    set DEBUGINFOD_URLS=`sh -c 'cat "$0"/*.urls; :' "@sysconfdir@/debuginfod" 2>/dev/null | tr '\n' ' '`
+    if ( "$DEBUGINFOD_URLS" != "" ) then
+        setenv DEBUGINFOD_URLS "$DEBUGINFOD_URLS"
+    else
+        unset DEBUGINFOD_URLS
     endif
-    unset debuginfod_urls
     unset prefix
 endif
diff --git a/config/profile.sh.in b/config/profile.sh.in
index afce3963..bad20b1e 100644
--- a/config/profile.sh.in
+++ b/config/profile.sh.in
@@ -1,4 +1,3 @@
-
 # $HOME/.profile* or similar files may first set $DEBUGINFOD_URLS.
 # If $DEBUGINFOD_URLS is not set there, we set it from system *.url files.
 # $HOME/.*rc or similar files may then amend $DEBUGINFOD_URLS.
@@ -7,11 +6,7 @@
 
 if [ -z "$DEBUGINFOD_URLS" ]; then
     prefix="@prefix@"
-    debuginfod_urls=`sh -c "cat @sysconfdir@/debuginfod/*.urls 2>/dev/null" | tr '\n' ' '`
-    if [ -n "$debuginfod_urls" ]; then
-        DEBUGINFOD_URLS="$debuginfod_urls"
-        export DEBUGINFOD_URLS
-    fi
-    unset debuginfod_urls
+    DEBUGINFOD_URLS=$(cat "@sysconfdir@/debuginfod"/*.urls 2>/dev/null | tr '\n' ' ')
+    [ -n "$DEBUGINFOD_URLS" ] && export DEBUGINFOD_URLS || unset DEBUGINFOD_URLS
     unset prefix
 fi
-- 
2.34.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]