From bb7f724185f344a656bbaf1df19f00f8265ea76d Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Sun, 5 Nov 2017 22:16:43 +0100 Subject: vim-plugin.eclass: simplify permission setting logic. We don't use Portage internal variables. Instead, we do away with that chunk of code and invoke fperms recursively on the directory with the right permission flags. Closes: https://bugs.gentoo.org/469400 --- eclass/vim-plugin.eclass | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'eclass') diff --git a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass index abe9c7b3661..a0ba714f6e6 100644 --- a/eclass/vim-plugin.eclass +++ b/eclass/vim-plugin.eclass @@ -35,19 +35,6 @@ vim-plugin_src_install() { has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" local f - if use !prefix && [[ ${EUID} -eq 0 ]] ; then - ebegin "Fixing file permissions" - # Make sure perms are good - chmod -R a+rX "${S}" || die "chmod failed" - find "${S}" -user 'portage' -exec chown root '{}' \; || die "chown failed" - if use userland_BSD || [[ ${CHOST} == *-darwin* ]] ; then - find "${S}" -group 'portage' -exec chgrp wheel '{}' \; || die "chgrp failed" - else - find "${S}" -group 'portage' -exec chgrp root '{}' \; || die "chgrp failed" - fi - eend $? - fi - # When globbing, if nothing exists, the shell literally returns the glob # pattern. So turn on nullglob and extglob options to avoid this. eshopts_push -s extglob @@ -85,8 +72,8 @@ vim-plugin_src_install() { mv "${S}" "${ED}"/usr/share/vim/vimfiles || die \ "couldn't move ${S} to ${ED}/usr/share/vim/vimfiles" - # Fix remaining bad permissions - chmod -R -x+X "${ED}"/usr/share/vim/vimfiles/ || die "chmod failed" + # Set permissions + fperms -R a+rX /usr/share/vim/vimfiles } # @FUNCTION: vim-plugin_pkg_postinst -- cgit v1.2.3-18-g5258