summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeeweep2020-01-06 10:50:31 +0800
committerpeeweep2020-01-06 10:50:31 +0800
commitd6568b2fe534a90cae601bc9a0745be03ec245d2 (patch)
treeab543d81604fc3ab88ecb158111ab3b397956632
parent3ae8d7e56789b3b802b2333cf37f551bd4cdc7ab (diff)
downloadaur-d6568b2fe534a90cae601bc9a0745be03ec245d2.tar.gz
Fix _pkgver can't be updated
-rw-r--r--.SRCINFO4
-rw-r--r--.gitignore5
-rw-r--r--PKGBUILD29
3 files changed, 21 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9f31954ca85f..68da04b97369 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ao-git
pkgdesc = An Electron wrapper for Microsoft To-Do
- pkgver = 6.8.0.r6.gf3fe9b0
+ pkgver = 6.9.0.r12.g7533b53
pkgrel = 1
url = https://github.com/klaussinani/ao
arch = x86_64
@@ -14,7 +14,7 @@ pkgbase = ao-git
depends = libxtst
depends = nss
depends = libxss
- provides = ao-git
+ provides = ao
conflicts = ao
source = git+https://github.com/klaussinani/ao.git
md5sums = SKIP
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..e91843612965
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+ao/
+pkg/
+src/
+*.pkg.tar.xz
+*.pkg.tar.zst
diff --git a/PKGBUILD b/PKGBUILD
index 48cfffcd7d89..908bc01bfc83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Modelmat <modelmat@outlook.com.au>
+# Maintainer: peeweep <peeweep at 0x0 dot ee>
+# Contributor: Modelmat <modelmat@outlook.com.au>
# Contributor: Paul Oppenheimer <redg3ar@airmail.cc>
# Contributor: David Naramski <david.naramski@gmail.com>
pkgname=ao-git
-_pkgname=${pkgname%%-git}
-pkgver=6.8.0.r6.gf3fe9b0
-_pkgver=6.8.0
+_pkgname=ao
+pkgver=6.9.0.r12.g7533b53
+_pkgver=${pkgver%%.r*}
pkgrel=1
pkgdesc="An Electron wrapper for Microsoft To-Do"
arch=('x86_64')
@@ -12,31 +13,29 @@ url="https://github.com/klaussinani/ao"
license=('MIT')
depends=('gconf' 'libnotify' 'libappindicator' 'libxtst' 'nss' 'libxss')
makedepends=('npm' 'electron' 'git')
-provides=('ao-git')
+provides=('ao')
conflicts=('ao')
-source=(git+$url.git)
+source=(git+${url}.git)
md5sums=('SKIP')
pkgver() {
- cd $_pkgname
+ cd ${_pkgname}
git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
-_pkgver() {
- cd $_pkgname
- echo ${git describe --abbrev=0:1}
-}
-
build() {
- cd ao
+ cd ${_pkgname}
npm install
npx electron-builder --linux deb
}
package() {
bsdtar -xf "${srcdir}/ao/dist/${_pkgname}_${_pkgver}_amd64.deb" \
- -C "${srcdir}" --include data.tar.xz
+ -C "${srcdir}" --include data.tar.xz
tar xfJ ${srcdir}/data.tar.xz -C ${pkgdir}
install -d ${pkgdir}/usr/bin/
- ln -s /opt/Ao/ao-app ${pkgdir}/usr/bin/ao
+ ln -s /opt/Ao/ao-app ${pkgdir}/usr/bin/${_pkgname}
+ install -Dm 644 "${pkgdir}/usr/share/icons/hicolor/0x0/apps/ao.png" \
+ "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
+ rm -rfv "${pkgdir}/usr/share/icons/hicolor"
}