summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Stinus2017-07-23 23:20:59 +0800
committerNicolas Stinus2017-07-23 23:26:14 +0800
commit174c2201b44b9c10ab08605603032536c52958ae (patch)
tree370cfada9b2a2ddaa79c119bcfb7fd07f0ce0be4
parent34c200a784b1e971338badb30ea1a797c1de7541 (diff)
downloadaur-174c2201b44b9c10ab08605603032536c52958ae.tar.gz
Pull upstream changes and replace pandoc by asciidoc
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
2 files changed, 9 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0afcdbb433ef..022a99ecdc9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
pkgbase = openvpn-nordvpn
pkgdesc = OpenVPN helper script for nordvpn.com
- pkgver = 0.1.19
+ pkgver = 0.1.21
pkgrel = 1
url = https://github.com/nstinus/nordvpn
install = openvpn-nordvpn.install
arch = any
license = MIT
makedepends = coreutils
- makedepends = pandoc
+ makedepends = asciidoc
depends = openvpn
depends = systemd
depends = openvpn-update-resolv-conf-git
@@ -21,7 +21,7 @@ pkgbase = openvpn-nordvpn
optdepends = python-pandas: run nordvpn infos command
optdepends = bash-completion: auto-complete commands
provides = nordvpn
- source = git+https://github.com/nstinus/nordvpn.git#commit=v0.1-19-g1dbfe40
+ source = git+https://github.com/nstinus/nordvpn.git#commit=v0.1-21-g3093830
sha1sums = SKIP
pkgname = openvpn-nordvpn
diff --git a/PKGBUILD b/PKGBUILD
index aa72254cdc97..0afc1039ee8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Nicolas Stinus <nicolas.stinus@gmail.com>
pkgname=openvpn-nordvpn
-pkgver=0.1.19
+pkgver=0.1.21
pkgrel=1
pkgdesc="OpenVPN helper script for nordvpn.com"
arch=(any)
@@ -19,9 +19,9 @@ optdepends=('iputils: run ping and rank functions'
'vpnfailsafe-git: use instead of update-resolv-conf if available'
'python-pandas: run nordvpn infos command'
'bash-completion: auto-complete commands')
-makedepends=('coreutils' 'pandoc')
+makedepends=('coreutils' 'asciidoc')
provides=('nordvpn')
-source=("git+https://github.com/nstinus/nordvpn.git#commit=${NORDVPN_COMMIT:-v0.1-19-g1dbfe40}")
+source=("git+https://github.com/nstinus/nordvpn.git#commit=${NORDVPN_COMMIT:-v0.1-21-g3093830}")
sha1sums=('SKIP')
install=${pkgname}.install
@@ -33,10 +33,9 @@ pkgver() {
}
build() {
- sed "s/@version@/$pkgver/g" nordvpn/doc/man.md \
- | pandoc -s -f markdown -t man \
- | gzip \
- > nordvpn.8.gz
+ sed "s/@version@/$pkgver/g" nordvpn/doc/man.asciidoc > man.asciidoc \
+ && a2x --doctype manpage --format manpage man.asciidoc \
+ && gzip -f nordvpn.8
}
package() {