summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Abbott2017-05-11 18:48:28 -0400
committerAaron Abbott2017-05-11 18:48:28 -0400
commit8f5c98adcf5883923398fa0c4ebdf322bad60776 (patch)
tree3068d61d94be0cadc034a7079103b7b20d77eeef
parentdaad75e3311296bd295a65e78f19a616c068c30b (diff)
downloadaur-8f5c98adcf5883923398fa0c4ebdf322bad60776.tar.gz
Upgraded to 1.3.2 and made changes in PKGBUILD
Added yarn as a build dep now too, as it is recommended in the hyper README. Also, changed the build() function a little too, see comments
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD43
2 files changed, 21 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e0436be45a9..55e0c47da82 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,24 @@
# Generated by mksrcinfo v8
-# Fri Mar 17 03:36:17 UTC 2017
+# Thu May 11 22:38:38 UTC 2017
pkgbase = hyper
pkgdesc = A terminal built on web technologies
- pkgver = 1.3.1
+ pkgver = 1.3.2
pkgrel = 1
url = https://hyper.is/
arch = any
license = MIT
makedepends = npm
+ makedepends = yarn
makedepends = python2
depends = nodejs
depends = electron
depends = gconf
conflicts = hyperterm
replaces = hyperterm
- source = https://github.com/zeit/hyper/archive/1.3.1.tar.gz
+ source = https://github.com/zeit/hyper/archive/1.3.2.tar.gz
source = https://raw.githubusercontent.com/zeit/art/master/hyper/mark/Hyper-Mark-120@3x.png
source = Hyper.desktop
- md5sums = ac14ce7ef3bc79aab1c6ed4e03ea1e10
+ md5sums = 385c0d909f82f492aeaa158a0164e9ef
md5sums = f3481e14cba331160339b3b5ab78872b
md5sums = 74cb7ba38e37332aa8300e4b6ba9c61c
diff --git a/PKGBUILD b/PKGBUILD
index 9d6dc295591..5e093b10af5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributer: auk
pkgname=hyper
-pkgver=1.3.1
+pkgver=1.3.2
pkgrel=1
epoch=
pkgdesc="A terminal built on web technologies"
@@ -12,7 +12,7 @@ url="https://hyper.is/"
license=('MIT')
groups=()
depends=('nodejs' 'electron' 'gconf')
-makedepends=('npm' 'python2')
+makedepends=('npm' 'yarn' 'python2')
checkdepends=()
optdepends=()
provides=()
@@ -29,43 +29,32 @@ source=(
"Hyper.desktop"
)
noextract=()
-md5sums=('ac14ce7ef3bc79aab1c6ed4e03ea1e10'
+md5sums=('385c0d909f82f492aeaa158a0164e9ef'
'f3481e14cba331160339b3b5ab78872b'
'74cb7ba38e37332aa8300e4b6ba9c61c')
validpgpkeys=()
-## This function uses yarn if it installed, otherwise npm as the default.
-npm_or_yarn() {
- if hash yarn 2>/dev/null; then
- yarn "$@"
- else
- npm "$@"
- fi
-}
-
prepare() {
cd "$pkgname-$pkgver"
- # # calls yarn if available, else npm
- # npm_or_yarn install
-
- # for now use just npm since errors have been reported
- npm install
-
- # Also hacky but need to explicitly install webpack at the correct version
- # or the app won't run. See https://github.com/zeit/hyper/issues/1418.
- # Hopefully this can be removed asap
- #npm install webpack@2.2.0-rc.3
+ # yarn is a build-dep according to the README
+ yarn install
}
build() {
cd "$pkgname-$pkgver"
- npm run build
-
- # this is hacky, but otherwise the package.json dist rule tries to build
- # for debian, rpm, etc.
- ./node_modules/.bin/build --linux dir
+ # node modules path => "nmp"
+ nmp="./node_modules/.bin"
+
+ # This build command is the same as the one defined in package.json via
+ # npm run dist except that it doesn't build for debian, rpm, etc.
+ npm run build &&
+ $nmp/cross-env BABEL_ENV=production babel \
+ --out-file app/dist/bundle.js \
+ --no-comments \
+ --minified app/dist/bundle.js &&
+ $nmp/build --linux --dir
}
package() {