From 9cbd621514659738f3a8943e4bde3d90c8febfc3 Mon Sep 17 00:00:00 2001 From: Benda Xu Date: Mon, 28 May 2018 16:07:40 +0800 Subject: Only move source directory when needed. This supports packages from outside CRAN. Fix typo in the last commit. --- files/eclass/R-packages.eclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/files/eclass/R-packages.eclass b/files/eclass/R-packages.eclass index 7d2afc6..5c3b66c 100644 --- a/files/eclass/R-packages.eclass +++ b/files/eclass/R-packages.eclass @@ -15,7 +15,9 @@ RDEPEND="${DEPEND}" R-packages_src_unpack() { unpack ${A} - mv ${PN//_/.} ${P} + if [[ -d "${PN//_/.}" ]] && [[ ! -d "${P}" ]]; then + mv ${PN//_/.} ${P} + fi } R-packages_src_prepare() { @@ -29,7 +31,7 @@ R-packages_src_compile() { R-packages_src_install() { insinto /usr/$(get_libdir)/R/site-library - doins -r "${WORKDIR}"/${PN//_/.}y + doins -r "${WORKDIR}"/${PN//_/.} } R-packages_pkg_postinst() { -- cgit v1.2.3-65-gdbad