summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2016-10-02 08:58:06 +0200
committerHans de Graaff <graaff@gentoo.org>2016-10-02 08:58:33 +0200
commitd855fee83d698a0535a4b8dfbbafa157969df1d9 (patch)
treed22f834a856dcf9383192088e6e634bc8e88a615 /dev-lang/ruby/ruby-2.1.9.ebuild
parentdev-ruby/capybara: add 2.9.2 (diff)
downloadgentoo-d855fee83d698a0535a4b8dfbbafa157969df1d9.tar.gz
gentoo-d855fee83d698a0535a4b8dfbbafa157969df1d9.tar.bz2
gentoo-d855fee83d698a0535a4b8dfbbafa157969df1d9.zip
dev-lang/ruby: Use rm -f consistently, addressing bug 594206
Package-Manager: portage-2.3.0
Diffstat (limited to 'dev-lang/ruby/ruby-2.1.9.ebuild')
-rw-r--r--dev-lang/ruby/ruby-2.1.9.ebuild8
1 files changed, 4 insertions, 4 deletions
diff --git a/dev-lang/ruby/ruby-2.1.9.ebuild b/dev-lang/ruby/ruby-2.1.9.ebuild
index 928d82bf8685..120844c4e503 100644
--- a/dev-lang/ruby/ruby-2.1.9.ebuild
+++ b/dev-lang/ruby/ruby-2.1.9.ebuild
@@ -68,7 +68,7 @@ src_prepare() {
# rubygems, but remove the bits that would cause a file collision.
einfo "Unbundling gems..."
cd "$S"
- rm -r \
+ rm -rf \
{bin,lib}/rake lib/rake.rb man/rake.1 \
bin/gem || die "removal failed"
@@ -191,9 +191,9 @@ src_install() {
emake V=1 DESTDIR="${D}" install || die "make install failed"
# Remove installed rubygems copy
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
- rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+ rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+ rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+ rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
if use doc; then
make DESTDIR="${D}" install-doc || die "make install-doc failed"