summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorxeruf2022-08-29 13:24:25 +0200
committerxeruf2022-08-29 13:24:25 +0200
commitd8e72a44ddbd38d6b550534cac1a799fbb4c179d (patch)
tree4ea3178ce8faad7870d1b98346de9124ee313a32
parent38b06257f45b15288b8b2e7025625651ee6c12ca (diff)
downloadaur-d8e72a44ddbd38d6b550534cac1a799fbb4c179d.tar.gz
Update versions from stretchly-git
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
2 files changed, 9 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 578d2478ad77..28158204b6e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = stretchly-xeruf-git
pkgdesc = The break reminder app with more restrictive menus
- pkgver = 1125.a3264ed
+ pkgver = 1161.cf29eb0
pkgrel = 1
url = https://github.com/xeruf/stretchly
arch = any
@@ -22,6 +22,8 @@ pkgbase = stretchly-xeruf-git
depends = libxcrypt-compat
depends = electron17
provides = stretchly
+ conflicts = stretchly
+ conflicts = stretchly-bin
source = git+https://github.com/xeruf/stretchly.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 4fa47a4e560c..c4f4196ccf4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_pkgname=stretchly
pkgname=${_pkgname}-xeruf-git
-pkgver=1125.a3264ed
+pkgver=1161.cf29eb0
pkgrel=1
pkgdesc="The break reminder app with more restrictive menus"
arch=('any')
@@ -12,6 +12,7 @@ depends=('gtk3' 'libnotify' 'nss' 'libxss' 'libxtst' 'xdg-utils' 'at-spi2-atk' '
makedepends=('git' 'nvm' 'jq' 'python')
provides=("$_pkgname")
source=("git+${url}.git")
+conflicts=("$_pkgname" "${_pkgname}-bin")
sha256sums=('SKIP')
pkgver() {
@@ -20,8 +21,7 @@ pkgver() {
}
_ensure_local_nvm() {
- if type nvm >/dev/null 2>&1
- then
+ if type nvm &>/dev/null; then
nvm deactivate
nvm unload
fi
@@ -59,8 +59,8 @@ build() {
./node_modules/.bin/electron-builder build \
--linux pacman \
--"${!CARCH}" \
- -c.electronDist=/usr/lib/electron \
- -c.electronVersion="$(</usr/lib/electron/version)"
+ -c.electronDist=/usr/lib/electron17 \
+ -c.electronVersion="$(</usr/lib/electron17/version)"
tar -C "${_unpackdir}" -Jxf "${_outfile}"
echo "Deleting Electron ($(du -h "$_electron" | awk '{print $1}'))..." >&2
@@ -74,7 +74,7 @@ build() {
install -D -m 0755 /dev/null "${_unpackdir}/usr/bin/stretchly"
cat >"${_unpackdir}/usr/bin/stretchly" <<EOF
#!/bin/sh
-exec electron '/opt/$(sed -E "s/'/'\\\\''/g" <<<"${_appname}")/resources/app.asar' "\$@"
+exec electron17 '/opt/$(sed -E "s/'/'\\\\''/g" <<<"${_appname}")/resources/app.asar' "\$@"
EOF
}