commit: 54f8eabb4b5621aef51c2d7d6d2f95601c74442b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 16 23:46:04 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 23:56:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f8eabb
net-misc/cfengine: fix ED/EROOT usage
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-misc/cfengine/cfengine-3.6.2-r1.ebuild | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
index c05b9132fce6..53c7b95c86ad 100644
--- a/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
+++ b/net-misc/cfengine/cfengine-3.6.2-r1.ebuild
@@ -88,12 +88,12 @@ src_install() {
find "${D}"/usr/share -name "*.cf" | xargs sed -i
"s,/sbin/ifconfig,$(which ifconfig),g"
# Evil workaround for now..
- mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF}
+ mv "${ED}"/usr/share/doc/${PN}/ "${ED}"/usr/share/doc/${PF}
dodoc AUTHORS
if ! use examples; then
- rm -rf "${D}"/usr/share/doc/${PF}/example*
+ rm -rf "${ED}"/usr/share/doc/${PF}/example*
fi
# Create cfengine working directory
@@ -132,10 +132,10 @@ pkg_postinst() {
# Fix old cf-servd, remove it after some releases.
local found=0
- for fname in $(find /etc/runlevels/ -type f -or -type l -name
'cf-servd'); do
+ for fname in $(find "${EROOT}"/etc/runlevels/ -type f -or -type l -name
'cf-servd'); do
found=1
- rm $fname
- ln -s /etc/init.d/cf-serverd $(echo $fname | sed
's:cf-servd:cf-serverd:')
+ rm "$fname"
+ ln -s "${EROOT}"/etc/init.d/cf-serverd $(echo "$fname" | sed
's:cf-servd:cf-serverd:')
done
if [ "${found}" -eq 1 ]; then