all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Ulrich Mueller <ulm@gentoo.org>
To: 70484@debbugs.gnu.org
Subject: bug#70484: Fix compatibility of build-aux/make-info-dir script
Date: Tue, 23 Apr 2024 19:36:54 +0200	[thread overview]
Message-ID: <u34rcrnex@gentoo.org> (raw)
In-Reply-To: <ZiQSFS4PxRoZmXZJ@localhost>

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

Attached patch fixes the problem for me. It applies cleanly to both
emacs-29 and master.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-build-aux-make-info-dir-Avoid-bashism-bug-70484.patch --]
[-- Type: text/x-patch, Size: 840 bytes --]

From cb490ee7a8365c6375dc6c7a5f6d8202ab381219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Tue, 23 Apr 2024 07:37:17 +0200
Subject: [PATCH] * build-aux/make-info-dir: Avoid bashism (bug#70484).

---
 build-aux/make-info-dir | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build-aux/make-info-dir b/build-aux/make-info-dir
index e5f4972902f..631fe533e69 100755
--- a/build-aux/make-info-dir
+++ b/build-aux/make-info-dir
@@ -33,7 +33,8 @@
 
 ## Header contains non-printing characters, so this is more
 ## reliable than using awk.
-cat <"${1?}" || exit
+test $# -ge 2 || exit 1
+cat <"$1"
 shift
 
 exec "${AWK-awk}" '
@@ -101,4 +102,4 @@       detexinfo()
       if (data[dircat])
         printf "\n%s\n%s", topic[dircat], data[dircat]
   }
-' "${@?}"
+' "$@"
-- 
2.44.0


  reply	other threads:[~2024-04-23 17:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-20 19:05 bug#70484: Fix compatibility of build-aux/make-info-dir script Felix Janda
2024-04-23 17:36 ` Ulrich Mueller [this message]
2024-04-23 17:57   ` Eli Zaretskii

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=u34rcrnex@gentoo.org \
    --to=ulm@gentoo.org \
    --cc=70484@debbugs.gnu.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.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.