Fix PKGBUILD

2 files changed, 10 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3d00b6a4374..e9df67ef16b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = r-usethis
 	pkgdesc = Automate Package and Project Setup
-	pkgver = 2.1.3
+	pkgver = 2.1.5
 	pkgrel = 1
 	url = https://cran.r-project.org/package=usethis
 	arch = any
@@ -29,12 +29,13 @@ pkgbase = r-usethis
 	optdepends = r-knitr
 	optdepends = r-magick
 	optdepends = r-mockr
+	optdepends = r-pkgload
 	optdepends = r-rmarkdown
 	optdepends = r-roxygen2
 	optdepends = r-spelling
 	optdepends = r-styler
 	optdepends = r-testthat
-	source = https://cran.r-project.org/src/contrib/usethis_2.1.3.tar.gz
-	sha256sums = 2db075980247d854110de60e7afe6f6e0b654a3ba49d0699ff40dd516e8e9bbf
+	source = https://cran.r-project.org/src/contrib/usethis_2.1.5.tar.gz
+	sha256sums = 7d539e16ecdc1cd45ba1a215d42d8b9c16bc38280ddd27048003dbb37b16f052
 
 pkgname = r-usethis
diff --git a/PKGBUILD b/PKGBUILD
index 4beef5ac5f81..a1554537863b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
+# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 
 _cranname=usethis
-_cranver=2.1.3
+_cranver=2.1.5
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
@@ -10,19 +10,16 @@ arch=(any)
 url="https://cran.r-project.org/package=${_cranname}"
 license=(GPL3)
 depends=('r>=3.4' 'r-cli>=3.0.1' 'r-clipr>=0.3.0' r-crayon 'r-curl>=2.7' 'r-desc>=1.4.0' 'r-fs>=1.3.0' 'r-gert>=1.4.1' 'r-gh>=1.2.1' 'r-glue>=1.3.0' r-jsonlite 'r-lifecycle>=1.0.0' r-purrr r-rappdirs 'r-rlang>=0.4.10' 'r-rprojroot>=1.2' r-rstudioapi r-whisker 'r-withr>=2.3.0' r-yaml)
-optdepends=(r-covr r-knitr r-magick r-mockr r-rmarkdown r-roxygen2 r-spelling r-styler r-testthat)
+optdepends=(r-covr r-knitr r-magick r-mockr r-pkgload r-rmarkdown r-roxygen2 r-spelling r-styler r-testthat)
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('2db075980247d854110de60e7afe6f6e0b654a3ba49d0699ff40dd516e8e9bbf')
+sha256sums=('7d539e16ecdc1cd45ba1a215d42d8b9c16bc38280ddd27048003dbb37b16f052')
 
 build() {
-  cd "${srcdir}"
-
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l ${srcdir}
+  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
 }
 
 package() {
-  cd "${srcdir}"
-
   install -dm0755 "${pkgdir}/usr/lib/R/library"
+
   cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
 }