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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D90DF1382C5 for ; Wed, 14 Apr 2021 00:27:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEDFEE086E; Wed, 14 Apr 2021 00:27:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95361E086E for ; Wed, 14 Apr 2021 00:27:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A9753340DB4 for ; Wed, 14 Apr 2021 00:27:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4BB14632 for ; Wed, 14 Apr 2021 00:27:43 +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: <1618360046.dc2a03dedc0e1381301c33bbb44e74b2be9f1a08.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nagtrap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild X-VCS-Directories: net-analyzer/nagtrap/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: dc2a03dedc0e1381301c33bbb44e74b2be9f1a08 X-VCS-Branch: master Date: Wed, 14 Apr 2021 00:27:43 +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: 043b5915-a30d-4f22-8243-977a541ec15f X-Archives-Hash: d57a684c6094d138e0a25620688a1c67 commit: dc2a03dedc0e1381301c33bbb44e74b2be9f1a08 Author: Sam James gentoo org> AuthorDate: Wed Apr 14 00:16:32 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Apr 14 00:27:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2a03de net-analyzer/nagtrap: fix installation of config, ${D} usage Closes: https://bugs.gentoo.org/782403 Signed-off-by: Sam James gentoo.org> net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild b/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild index 203d35be9af..8f20f2c8167 100644 --- a/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild +++ b/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,8 +22,8 @@ src_install() { dodoc ChangeLog THANKS dodir /usr/share/nagtrap - cp -r {db,nagtrap} "${D}"/usr/share/nagtrap/ - fperms 640 "${D}"/usr/share/nagtrap/nagtrap/etc/config.ini.php-dist + cp -r {db,nagtrap} "${ED}"/usr/share/nagtrap/ || die + fperms 640 /usr/share/nagtrap/nagtrap/etc/config.ini.php-dist sed -i -e 's#use lib.*#use lib "/usr/lib/nagios/plugins";#g' \ plugin/check_snmptraps.pl || die "sed failed" @@ -35,10 +35,10 @@ src_install() { pkg_postinst() { elog "Before running NagTrap for the first time, you will need setup its configuration" - elog "/usr/share/nagtrap/nagtrap/etc/config.ini.php" + elog "${EROOT}/usr/share/nagtrap/nagtrap/etc/config.ini.php" elog "A sample is installed in" - elog "/usr/share/nagtrap/nagtrap/etc/config.ini.php-sample" + elog "${EROOT}/usr/share/nagtrap/nagtrap/etc/config.ini.php-sample" elog elog "NagTrap requires snmptt to write traps into a MySQL database." - elog "A database schema is available in {$D}usr/share/nagtrap/db" + elog "A database schema is available in ${EROOT}/usr/share/nagtrap/db" }