From a1fa4c0ef15a07ec0d1b25277c77da12eb15a9df Mon Sep 17 00:00:00 2001 From: imlonghao Date: Tue, 26 Mar 2019 22:45:10 +0800 Subject: [PATCH] Fix post_install --- .SRCINFO | 4 +++- PKGBUILD | 11 ++++------- cloudflared-bin.install | 6 ++++++ 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 cloudflared-bin.install diff --git a/.SRCINFO b/.SRCINFO index a23c2117b351..97da36a8d0b0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = cloudflared-bin pkgdesc = An Argo Tunnel client which proxies any local webserver through the Cloudflare network pkgver = 2019.3.2 - pkgrel = 1 + pkgrel = 2 url = https://developers.cloudflare.com/argo-tunnel/ arch = x86_64 arch = i686 @@ -12,9 +12,11 @@ pkgbase = cloudflared-bin provides = cloudflared conflicts = cloudflared source = https://raw.githubusercontent.com/cloudflare/cloudflared/master/LICENSE + source = cloudflared-bin.install source = cloudflared.yml source = cloudflared@.service source = cloudflared-dns.service + sha256sums = adbe05f079d4d4fdf3ead36eead813c9bca8bed422be6d643aff14f91d47f15e sha256sums = 6a486a0f6c00e87cce1caf0aa8db45ea9fefd0bf91d9be6fc44460160dc0dbda sha256sums = 4e06eb54143d872f73707ed2bba2ba2198649d3066df741bd0cfda5d1a5f334d sha256sums = 407ff5e3f3fdfa3440bac2d4c8cb191493be37fa3bad388e7ab49ffd07c83f21 diff --git a/PKGBUILD b/PKGBUILD index 4a3e948e66d7..d07e932b214f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgname=cloudflared-bin pkgver=2019.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="An Argo Tunnel client which proxies any local webserver through the Cloudflare network" arch=("x86_64" "i686" "armv6h" "armv7h") url="https://developers.cloudflare.com/argo-tunnel/" @@ -11,6 +11,7 @@ depends=("glibc") provides=("cloudflared") conflicts=("cloudflared") source=("https://raw.githubusercontent.com/cloudflare/cloudflared/master/LICENSE" + "cloudflared-bin.install" "cloudflared.yml" "cloudflared@.service" "cloudflared-dns.service") @@ -18,7 +19,8 @@ source_x86_64=("https://bin.equinox.io/c/VdrWdbjqyF/cloudflared-stable-linux-amd source_i686=("https://bin.equinox.io/c/VdrWdbjqyF/cloudflared-stable-linux-386.tgz") source_armv6h=("https://bin.equinox.io/c/VdrWdbjqyF/cloudflared-stable-linux-arm.tgz") source_armv7h=("https://bin.equinox.io/c/VdrWdbjqyF/cloudflared-stable-linux-arm.tgz") -sha256sums=('6a486a0f6c00e87cce1caf0aa8db45ea9fefd0bf91d9be6fc44460160dc0dbda' +sha256sums=('adbe05f079d4d4fdf3ead36eead813c9bca8bed422be6d643aff14f91d47f15e' + '6a486a0f6c00e87cce1caf0aa8db45ea9fefd0bf91d9be6fc44460160dc0dbda' '4e06eb54143d872f73707ed2bba2ba2198649d3066df741bd0cfda5d1a5f334d' '407ff5e3f3fdfa3440bac2d4c8cb191493be37fa3bad388e7ab49ffd07c83f21' 'bc40e3f7e1b21b93a949a1b1c05639584943d9ce9cc7ccb96612688eeb9fd206') @@ -40,9 +42,4 @@ package() { install -Dm644 cloudflared-dns.service ${pkgdir}/usr/lib/systemd/system/cloudflared-dns.service } -post_install() { - getent passwd cloudflared || useradd --system --user-group -m --home /var/lib/cloudflared cloudflared - chown cloudflared.cloudflared /etc/cloudflared -} - # vim: ts=2 sw=2 et: diff --git a/cloudflared-bin.install b/cloudflared-bin.install new file mode 100644 index 000000000000..0e8e047fd816 --- /dev/null +++ b/cloudflared-bin.install @@ -0,0 +1,6 @@ +post_install() { + getent passwd cloudflared || useradd --system --user-group -m --home /var/lib/cloudflared cloudflared + chown cloudflared.cloudflared /etc/cloudflared +} + +# vim: ts=2 sw=2 et: \ No newline at end of file