From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1058935-garchives=archives.gentoo.org@lists.gentoo.org>
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 34A8C138334
for <garchives@archives.gentoo.org>; Sun, 25 Nov 2018 21:43:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4C788E09E7;
Sun, 25 Nov 2018 21:43:12 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 20452E09E7
for <gentoo-commits@lists.gentoo.org>; Sun, 25 Nov 2018 21:43:12 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 419A1335D98
for <gentoo-commits@lists.gentoo.org>; Sun, 25 Nov 2018 21:43:10 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DC4404BD
for <gentoo-commits@lists.gentoo.org>; Sun, 25 Nov 2018 21:43:06 +0000 (UTC)
From: "Michał Górny" <mgorny@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, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1543182177.8fc9875d64d40136950b50e5319c3cb5e37a5f36.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/minidlna/minidlna-1.2.1-r1.ebuild
X-VCS-Directories: net-misc/minidlna/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 8fc9875d64d40136950b50e5319c3cb5e37a5f36
X-VCS-Branch: master
Date: Sun, 25 Nov 2018 21:43:06 +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-Archives-Salt: c471b376-b2e3-4989-81a8-72bd9f6ed1e8
X-Archives-Hash: 689ebb2fbc836c6cb63588af65e0cafc
commit: 8fc9875d64d40136950b50e5319c3cb5e37a5f36
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 21:18:06 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 21:42:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc9875d
net-misc/minidlna: Fix ownership fixup code
Use proper bash syntax, and respect EROOT.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-misc/minidlna/minidlna-1.2.1-r1.ebuild | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
index a41c01c156b..b18b7c7a53d 100644
--- a/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
+++ b/net-misc/minidlna/minidlna-1.2.1-r1.ebuild
@@ -77,8 +77,8 @@ src_install() {
}
pkg_preinst() {
- local my_is_new="yes"
- [ -d "${EPREFIX}"/var/lib/minidlna ] && my_is_new="no"
+ local my_is_new=yes
+ [[ -d ${EROOT}/var/lib/minidlna ]] && my_is_new=no
enewgroup minidlna
enewuser minidlna -1 -1 /var/lib/minidlna minidlna
@@ -86,10 +86,11 @@ pkg_preinst() {
fowners minidlna:minidlna /var/{lib,log}/minidlna
fperms 0750 /var/{lib,log}/minidlna
- if [ -d "${EPREFIX}"/var/lib/minidlna ] && [ "${my_is_new}" == "yes" ] ; then
- # created by above enewuser command w/ wrong group and permissions
- chown minidlna:minidlna "${EPREFIX}"/var/lib/minidlna || die
- chmod 0750 "${EPREFIX}"/var/lib/minidlna || die
+ if [[ -d ${EROOT}/var/lib/minidlna && ${my_is_new} == yes ]]; then
+ # created by above enewuser command w/ wrong group
+ # and permissions
+ chown minidlna:minidlna "${EROOT}"/var/lib/minidlna || die
+ chmod 0750 "${EROOT}"/var/lib/minidlna || die
# if user already exists, but /var/lib/minidlna is missing
# rely on ${D}/var/lib/minidlna created in src_install
fi