summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD56
-rwxr-xr-xchrysalis.sh12
3 files changed, 23 insertions, 69 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 075ad7724750..95b6827d51f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,15 @@
-pkgbase = chrysalis
- pkgdesc = Graphical configurator for Kaleidoscope-powered keyboards
+pkgbase = chrysalis-bin
+ pkgdesc = Graphical configurator for Kaleidoscope-powered keyboards (AppImage)
pkgver = 0.11.9
- pkgrel = 2
+ pkgrel = 1
url = https://github.com/keyboardio/Chrysalis
arch = x86_64
license = GPL3
- makedepends = git
- makedepends = jq
- makedepends = moreutils
- makedepends = node-gyp
- makedepends = yarn
- depends = electron17
depends = fuse2
- depends = uucp
- source = https://github.com/keyboardio/Chrysalis/archive/v0.11.9/Chrysalis-0.11.9.tar.gz
- source = chrysalis.sh
- sha256sums = a653d46a25aea2fd6a08ecce28337577a2980bf3a98b0781a5065ac64ca7d5b9
- sha256sums = 9de3ff052ca4600862b8663b93bf2b4223cf2e637995c67e1fe4cb4ed893b39f
+ provides = chrysalis
+ conflicts = chrysalis
+ options = !strip
+ source = https://github.com/keyboardio/Chrysalis/releases/download/v0.11.9/Chrysalis-0.11.9.AppImage
+ sha256sums = 09ee9aab8259dbbd634f3028519c7a6d9a664145e686116069e99f65fa244b6e
-pkgname = chrysalis
+pkgname = chrysalis-bin
diff --git a/PKGBUILD b/PKGBUILD
index 4497b7a4acd5..3d28ab8ec5a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,22 @@
# Maintainer: Caleb Maclennan <caleb@alerque.com>
+# Maintainer: Alfredo Luque <me@aluque.io>
+# Maintainer: Paul Mourer <paul.mourer@gmail.com>
-pkgname=chrysalis
-pkgdesc='Graphical configurator for Kaleidoscope-powered keyboards'
+pkgname=chrysalis-bin
+_pkgname=${pkgname%-bin}
+pkgdesc='Graphical configurator for Kaleidoscope-powered keyboards (AppImage)'
pkgver=0.11.9
-pkgrel=2
+pkgrel=1
arch=(x86_64)
-url="https://github.com/keyboardio/${pkgname^}"
+url="https://github.com/keyboardio/${_pkgname^}"
license=(GPL3)
-_electron=electron17 # upstream claims there are bugs dealing with firmware with 18+
-depends=("$_electron"
- fuse2
- uucp)
-makedepends=(git
- jq
- moreutils
- node-gyp
- yarn)
-_archive="${pkgname^}-$pkgver"
-source=("$url/archive/v$pkgver/$_archive.tar.gz"
- "$pkgname.sh")
-sha256sums=('a653d46a25aea2fd6a08ecce28337577a2980bf3a98b0781a5065ac64ca7d5b9'
- '9de3ff052ca4600862b8663b93bf2b4223cf2e637995c67e1fe4cb4ed893b39f')
-
-_yarnargs="--cache-folder '$srcdir/node_modules'"
-
-prepare() {
- local _electronVersion=$($_electron --version | sed -e 's/^v//')
- cd "$_archive"
- jq 'del(.devDependencies["electron"])' package.json | sponge package.json
- yarn $_yarnargs install --frozen-lockfile --ignore-scripts
- yarn $_yarnargs add -D --no-lockfile --ignore-scripts electron@$_electronVersion
-}
-
-build() {
- cd "$_archive"
- yarn $_yarnargs run build:linux
-}
+depends=(fuse2)
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+options=(!strip)
+source=("$url/releases/download/v$pkgver/${_pkgname^}-$pkgver.AppImage")
+sha256sums=('09ee9aab8259dbbd634f3028519c7a6d9a664145e686116069e99f65fa244b6e')
package() {
- sed -E "s/electron/$_electron/" "$pkgname.sh" |
- install -Dm0755 /dev/stdin "$pkgdir/usr/bin/$pkgname"
- 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"
- install -Dm0644 -t "$pkgdir/usr/lib/pkgname/" NEWS.md
- mkdir -p "$pkgdir/usr/lib/udev/rules.d/"
- ln -s /usr/lib/chrysalis/static/udev/60-kaleidoscope.rules "$pkgdir/usr/lib/udev/rules.d/"
+ install -Dm0755 "${_pkgname^}-$pkgver.AppImage" "$pkgdir/usr/bin/$_pkgname"
}
diff --git a/chrysalis.sh b/chrysalis.sh
deleted file mode 100755
index b0835280ba68..000000000000
--- a/chrysalis.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-set -e
-
-if [ -n "$WAYLAND_DISPLAY" ]; then
- set -- --enable-features=UseOzonePlatform --ozone-platform=wayland "$@"
-fi
-
-if ! grep -qFx 1 /proc/sys/kernel/unprivileged_userns_clone; then
- set -- --no-sandbox "$@"
-fi
-
-exec electron /usr/lib/chrysalis/app.asar "$@"