From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/
Date: Sun, 25 Nov 2018 21:43:06 +0000 (UTC) [thread overview]
Message-ID: <1543182177.8fc9875d64d40136950b50e5319c3cb5e37a5f36.mgorny@gentoo> (raw)
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
next reply other threads:[~2018-11-25 21:43 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-25 21:43 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-04-08 4:45 [gentoo-commits] repo/gentoo:master commit in: net-misc/minidlna/ Michał Górny
2023-06-06 18:46 Michał Górny
2023-06-06 16:55 Arthur Zamarin
2023-06-06 10:06 Sam James
2023-06-06 10:06 Sam James
2023-06-01 4:07 Michał Górny
2023-01-21 19:15 Michał Górny
2023-01-21 18:53 Arthur Zamarin
2022-12-31 13:01 Sam James
2022-12-31 13:01 Sam James
2022-11-28 23:50 James Le Cuirot
2022-09-02 17:37 Michał Górny
2022-05-06 11:25 Jakov Smolić
2022-05-06 8:10 Agostino Sarubbo
2022-05-05 18:39 Arthur Zamarin
2022-05-05 13:31 Michał Górny
2022-01-03 23:26 David Seifert
2021-08-16 21:28 Sam James
2020-12-03 6:52 Sam James
2020-11-29 8:16 Agostino Sarubbo
2020-11-28 13:34 Thomas Deutschmann
2020-04-26 12:26 David Seifert
2020-01-03 20:40 Michał Górny
2019-03-19 2:03 Thomas Deutschmann
2019-03-16 14:17 Mikle Kolyada
2019-03-15 8:15 Mikle Kolyada
2018-11-26 4:22 Michał Górny
2018-11-25 21:43 Michał Górny
2018-11-25 21:43 Michał Górny
2018-11-25 21:43 Michał Górny
2018-11-25 21:43 Michał Górny
2018-11-25 21:43 Michał Górny
2018-11-25 21:43 Michał Górny
2018-11-25 21:43 Michał Górny
2018-11-25 21:43 Michał Górny
2018-11-25 21:43 Michał Górny
2018-11-25 21:43 Michał Górny
2018-11-25 21:43 Michał Górny
2018-11-25 21:43 Michał Górny
2018-11-25 10:11 Michał Górny
2018-08-11 9:06 Andreas Sturmlechner
2017-03-17 10:15 Agostino Sarubbo
2017-03-15 13:00 Michael Weber
2016-02-23 20:36 Michael Weber
2015-10-03 16:51 Michael Weber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1543182177.8fc9875d64d40136950b50e5319c3cb5e37a5f36.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox