From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3326915806E for ; Wed, 7 Jun 2023 11:13:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B2BCE087D; Wed, 7 Jun 2023 11:13:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3AF61E087D for ; Wed, 7 Jun 2023 11:13:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C018340D39 for ; Wed, 7 Jun 2023 11:13:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A13DA89 for ; Wed, 7 Jun 2023 11:13:36 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1686136338.1947f0ed81f3b95a7e10a8a5a707776948f8a487.sam@gentoo> Subject: [gentoo-commits] proj/gentoo-functions:master commit in: / X-VCS-Repository: proj/gentoo-functions X-VCS-Files: functions.sh X-VCS-Directories: / X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1947f0ed81f3b95a7e10a8a5a707776948f8a487 X-VCS-Branch: master Date: Wed, 7 Jun 2023 11:13:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f084fbf4-2c75-4996-8a7e-4743641827d6 X-Archives-Hash: ed55d7dc0922463f842daa131807d43e commit: 1947f0ed81f3b95a7e10a8a5a707776948f8a487 Author: Kerin Millar plushkava net> AuthorDate: Fri Feb 24 18:49:33 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jun 7 11:12:18 2023 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=1947f0ed Have ebegin() strip the trailing LF of the message it is given, if any This is a precautionary measure, given that ebegin() appends " ..." to the message. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> functions.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/functions.sh b/functions.sh index 97b0e6b..78317b3 100644 --- a/functions.sh +++ b/functions.sh @@ -179,8 +179,9 @@ ebegin() local msg if ! yesno "${EINFO_QUIET}"; then - msg="$* ...${genfun_newline}" - GENFUN_CALLER=ebegin _eprint "${GOOD}" "${msg}" + msg=$* + msg=${msg%"${genfun_newline}"} + _eprint "${GOOD}" "${msg} ...${genfun_newline}" fi }