From: David Seifert Date: Sat, 8 Feb 2020 16:23:08 +0000 (+0100) Subject: net-misc/iputils: [QA] Fix UnnecessarySlashStrip X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3228f943629c89784fa4a2136ea8f26b0a5df284;p=gentoo.git net-misc/iputils: [QA] Fix UnnecessarySlashStrip Signed-off-by: David Seifert --- diff --git a/net-misc/iputils/iputils-20190709.ebuild b/net-misc/iputils/iputils-20190709.ebuild index 3d4c44ef2ce2..1c478e19659d 100644 --- a/net-misc/iputils/iputils-20190709.ebuild +++ b/net-misc/iputils/iputils-20190709.ebuild @@ -142,7 +142,7 @@ src_install() { dodir /bin local my_bin for my_bin in $(usex arping arping '') ping ; do - mv "${ED%/}"/usr/bin/${my_bin} "${ED%/}"/bin/ || die + mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die done dosym ping /bin/ping4 @@ -175,7 +175,7 @@ src_install() { if [[ -f "${S}/doc/${my_bin}.html" ]] ; then html_man_pages+=( ${my_bin}.html ) fi - done 3< <(find "${ED%/}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null) + done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null) pushd doc &>/dev/null || die doman "${man_pages[@]}" @@ -186,7 +186,7 @@ src_install() { popd &>/dev/null || die else if use doc ; then - mv "${ED%/}"/usr/share/${PN} "${ED%/}"/usr/share/doc/${PF}/html || die + mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die fi fi } diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild index b017e1a7fb9a..228cbf543703 100644 --- a/net-misc/iputils/iputils-99999999.ebuild +++ b/net-misc/iputils/iputils-99999999.ebuild @@ -142,7 +142,7 @@ src_install() { dodir /bin local my_bin for my_bin in $(usex arping arping '') ping ; do - mv "${ED%/}"/usr/bin/${my_bin} "${ED%/}"/bin/ || die + mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die done dosym ping /bin/ping4 @@ -175,7 +175,7 @@ src_install() { if [[ -f "${S}/doc/${my_bin}.html" ]] ; then html_man_pages+=( ${my_bin}.html ) fi - done 3< <(find "${ED%/}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null) + done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null) pushd doc &>/dev/null || die doman "${man_pages[@]}" @@ -186,7 +186,7 @@ src_install() { popd &>/dev/null || die else if use doc ; then - mv "${ED%/}"/usr/share/${PN} "${ED%/}"/usr/share/doc/${PF}/html || die + mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die fi fi }