From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Ulrich Mueller Newsgroups: gmane.emacs.bugs Subject: bug#70484: Fix compatibility of build-aux/make-info-dir script Date: Tue, 23 Apr 2024 19:36:54 +0200 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9778"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) To: 70484@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Apr 23 19:38:25 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rzK65-0002O1-MG for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 23 Apr 2024 19:38:25 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzK5V-0000K2-ST; Tue, 23 Apr 2024 13:37:50 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rzK5U-0000IB-4E for bug-gnu-emacs@gnu.org; Tue, 23 Apr 2024 13:37:48 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzK5T-0004Lu-RS for bug-gnu-emacs@gnu.org; Tue, 23 Apr 2024 13:37:47 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rzK5k-0004kl-8h for bug-gnu-emacs@gnu.org; Tue, 23 Apr 2024 13:38:04 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Ulrich Mueller Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 23 Apr 2024 17:38:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70484 X-GNU-PR-Package: emacs Original-Received: via spool by 70484-submit@debbugs.gnu.org id=B70484.171389384917898 (code B ref 70484); Tue, 23 Apr 2024 17:38:04 +0000 Original-Received: (at 70484) by debbugs.gnu.org; 23 Apr 2024 17:37:29 +0000 Original-Received: from localhost ([127.0.0.1]:53444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzK58-0004eJ-Da for submit@debbugs.gnu.org; Tue, 23 Apr 2024 13:37:28 -0400 Original-Received: from mail.gentoo.org ([2001:470:ea4a:1:5054:ff:fec7:86e4]:38559 helo=smtp.gentoo.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzK54-0004c9-NI for 70484@debbugs.gnu.org; Tue, 23 Apr 2024 13:37:24 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:283888 Archived-At: --=-=-= Content-Type: text/plain Attached patch fixes the problem for me. It applies cleanly to both emacs-29 and master. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-build-aux-make-info-dir-Avoid-bashism-bug-70484.patch >From cb490ee7a8365c6375dc6c7a5f6d8202ab381219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= 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 --=-=-=--