upgpkg: chrysalis 0.8.4-2

2 files changed, 32 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 977e4fab359a..21e241e07c11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = chrysalis
 	pkgdesc = Graphical configurator for Kaleidoscope-powered keyboards
 	pkgver = 0.8.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/keyboardio/Chrysalis
 	arch = x86_64
 	license = GPL3
+	makedepends = git
 	makedepends = jq
 	makedepends = moreutils
 	makedepends = node-gyp
 	makedepends = yarn
-	depends = electron
+	depends = electron12
 	depends = fuse2
 	depends = uucp
-	source = chrysalis-0.8.4.tar.gs::https://github.com/keyboardio/Chrysalis/archive/v0.8.4.tar.gz
+	source = Chrysalis-0.8.4.tar.gz::https://github.com/keyboardio/Chrysalis/archive/v0.8.4.tar.gz
 	source = chrysalis.sh
 	sha256sums = e7442fe571a49b09f4fa1a18bd4ec1655212e312b481d9f72732943ee113b8d3
 	sha256sums = 9de3ff052ca4600862b8663b93bf2b4223cf2e637995c67e1fe4cb4ed893b39f
 
 pkgname = chrysalis
-
diff --git a/PKGBUILD b/PKGBUILD
index 57c8acbe4c10..d326600a4a4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,35 +3,44 @@
 pkgname=chrysalis
 pkgdesc='Graphical configurator for Kaleidoscope-powered keyboards'
 pkgver=0.8.4
-pkgrel=1
-arch=('x86_64')
+pkgrel=2
+arch=(x86_64)
 url="https://github.com/keyboardio/${pkgname^}"
-license=('GPL3')
-depends=('electron' 'fuse2' 'uucp')
-makedepends=('jq' 'moreutils' 'node-gyp' 'yarn')
-source=("$pkgname-$pkgver.tar.gs::$url/archive/v$pkgver.tar.gz"
+license=(GPL3)
+_electron=electron12
+depends=("$_electron"
+         fuse2
+         uucp)
+makedepends=(git
+             jq
+             moreutils
+             node-gyp
+             yarn)
+_archive="${pkgname^}-$pkgver"
+source=("$_archive.tar.gz::$url/archive/v$pkgver.tar.gz"
         "$pkgname.sh")
 sha256sums=('e7442fe571a49b09f4fa1a18bd4ec1655212e312b481d9f72732943ee113b8d3'
             '9de3ff052ca4600862b8663b93bf2b4223cf2e637995c67e1fe4cb4ed893b39f')
 
 prepare() {
-    local _electronVersion=$(electron --version | sed -e 's/^v//')
-    cd "${pkgname^}-$pkgver"
-    sed -i -e '/plugin:prettier/d' .eslintrc.js
-    jq 'del(.devDependencies["electron"])' package.json | sponge package.json
-    yarn --cache-folder "$srcdir/node_modules" install --frozen-lockfile --ignore-scripts
-    yarn --cache-folder "$srcdir/node_modules" add -D --no-lockfile --ignore-scripts electron@$_electronVersion
+	local _electronVersion=$($_electron --version | sed -e 's/^v//')
+	cd "$_archive"
+	sed -i -e '/plugin:prettier/d' .eslintrc.js
+	jq 'del(.devDependencies["electron"])' package.json | sponge package.json
+	yarn --cache-folder "$srcdir/node_modules" install --frozen-lockfile --ignore-scripts
+	yarn --cache-folder "$srcdir/node_modules" add -D --no-lockfile --ignore-scripts electron@$_electronVersion
 }
 
 build() {
-    cd "${pkgname^}-$pkgver"
-    yarn --cache-folder "$srcdir/node_modules" run build:linux
+	cd "$_archive"
+	yarn --cache-folder "$srcdir/node_modules" run build:linux
 }
 
 package() {
-    cd "${pkgname^}-$pkgver"
-    install -Dm755 "../$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
-    local _dist=dist/linux-unpacked/resources
-    install -Dm644 -t "$pkgdir/usr/lib/$pkgname/" "$_dist/app.asar"
-    cp -a "$_dist/static" "$pkgdir/usr/lib/$pkgname"
+	sed -E "s/electron/$_electron/" "$pkgname.sh" |
+		install -Dm0755 -t "$pkgdir/usr/bin/" /dev/stdin
+	cd "$_archive"
+	local _dist=dist/linux-unpacked/resources
+	install -Dm0644 -t "$pkgdir/usr/lib/$pkgname/" "$_dist/app.asar"
+	cp -a "$_dist/static" "$pkgdir/usr/lib/$pkgname"
 }