From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1396626-garchives=archives.gentoo.org@lists.gentoo.org> 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 5BD93158090 for <garchives@archives.gentoo.org>; Sun, 15 May 2022 01:00:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8BBB5E0863; Sun, 15 May 2022 01:00:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 68A2FE0841 for <gentoo-commits@lists.gentoo.org>; Sun, 15 May 2022 01:00:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 7D79D341BE3 for <gentoo-commits@lists.gentoo.org>; Sun, 15 May 2022 01:00:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 064BE466 for <gentoo-commits@lists.gentoo.org>; Sun, 15 May 2022 01:00:32 +0000 (UTC) From: "Sam James" <sam@gentoo.org> 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" <sam@gentoo.org> Message-ID: <1652576405.d4bc6cc2413b2a28a5984e1f151278ec4f3d1ff1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/amanda/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/amanda/amanda-3.5.1-r3.ebuild X-VCS-Directories: app-backup/amanda/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d4bc6cc2413b2a28a5984e1f151278ec4f3d1ff1 X-VCS-Branch: master Date: Sun, 15 May 2022 01:00:32 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6f973046-23ed-4af9-abef-c131eb505561 X-Archives-Hash: 053925678bc47b8e257f7849123314f9 commit: d4bc6cc2413b2a28a5984e1f151278ec4f3d1ff1 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat May 7 06:50:28 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun May 15 01:00:05 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4bc6cc2 app-backup/amanda: egrep -> grep -E Signed-off-by: Sam James <sam <AT> gentoo.org> app-backup/amanda/amanda-3.5.1-r3.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app-backup/amanda/amanda-3.5.1-r3.ebuild b/app-backup/amanda/amanda-3.5.1-r3.ebuild index 9498a6165145..f838aa934335 100644 --- a/app-backup/amanda/amanda-3.5.1-r3.ebuild +++ b/app-backup/amanda/amanda-3.5.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -77,7 +77,7 @@ amanda_variable_setup() { local currentamanda # Grab the current settings - currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)" + currentamanda="$(set | grep -E "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)" # First we set the defaults AMANDA_GROUP_NAME=amanda @@ -106,7 +106,7 @@ amanda_variable_setup() { # Now pull in the old stuff if [[ -f ${EROOT}${ENVDIR}/${ENVDFILE} ]]; then # We don't just source it as we don't want everything in there. - eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS') + eval $(grep -E "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS') fi # Re-apply the new settings if any @@ -152,7 +152,7 @@ src_prepare() { # places for us to work in mkdir -p "${MYFILESDIR}" || die # Now we store the settings we just created - set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die + set | grep -E "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}" || die # Prepare our custom files einfo "Building custom configuration files"