upgpkg: heroku-cli 7.47.7-2

recompile without nodenv

2 files changed, 4 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2de3487cf59f..c8fc41976b69 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = heroku-cli
 	pkgdesc = CLI to manage Heroku apps and services with forced auto-update removed
 	pkgver = 7.47.7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://devcenter.heroku.com/articles/heroku-cli
 	arch = any
 	license = custom
 	license = ISC
 	makedepends = npm
-	makedepends = yarn
 	makedepends = perl
 	depends = nodejs
 	optdepends = git: Deploying to Heroku
diff --git a/PKGBUILD b/PKGBUILD
index 6d55550850d6..b9a7c11a6da5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,24 +4,14 @@
 
 pkgname=heroku-cli
 pkgver=7.47.7
-pkgrel=1
+pkgrel=2
 _builddir=cli-$pkgver-$pkgrel
 pkgdesc="CLI to manage Heroku apps and services with forced auto-update removed"
 arch=('any')
 url="https://devcenter.heroku.com/articles/heroku-cli"
 license=('custom' 'ISC')
 depends=('nodejs')
-# the heroku-cli upstream maintainers live in their own little bubble, so this
-# package now requires both npm and yarn to actually complete the build process.
-#
-# If you need to stick to `npm` the `heroku-cli-bin` works with either/both
-# `npm` and `yarn`, and the package is built through the exact same process,
-# with the exception that it's pre-compiled using my machine before I release
-# it (hence the `-bin` suffix)
-#
-# I have tried every option I can think of to get it to build correctly with
-# pure `npm`; if you have a suggestion I'm all ears
-makedepends=('npm' 'yarn' 'perl')
+makedepends=('npm' 'perl')
 optdepends=('git: Deploying to Heroku')
 conflicts=('heroku-cli-bin' 'heroku-client-standalone' 'heroku-toolbelt' 'ruby-heroku')
 source=("https://github.com/heroku/cli/archive/v$pkgver.tar.gz")
@@ -55,7 +45,7 @@ prepare() {
     pushd "cli-$pkgver"
 
       # install packaging tools
-      yarn
+      npm install
 
       pushd packages/cli