chore: reformat for easiler diffs and conflict resolution

This commit is contained in:
Levente Polyak
2025-05-25 14:33:26 +02:00
parent 7f459138a3
commit 26a66c5bf5
2 changed files with 12 additions and 10 deletions

View File

@ -5,8 +5,8 @@ pkgbase = caddy
url = https://github.com/caddyserver/caddy url = https://github.com/caddyserver/caddy
arch = x86_64 arch = x86_64
license = Apache-2.0 license = Apache-2.0
makedepends = go
makedepends = git makedepends = git
makedepends = go
depends = glibc depends = glibc
backup = etc/caddy/Caddyfile backup = etc/caddy/Caddyfile
source = git+https://github.com/caddyserver/caddy.git#tag=v2.10.0?signed source = git+https://github.com/caddyserver/caddy.git#tag=v2.10.0?signed

View File

@ -11,11 +11,18 @@ pkgver=2.10.0
pkgrel=2 pkgrel=2
pkgdesc='Fast web server with automatic HTTPS' pkgdesc='Fast web server with automatic HTTPS'
url='https://github.com/caddyserver/caddy' url='https://github.com/caddyserver/caddy'
arch=('x86_64') arch=(x86_64)
license=(Apache-2.0) license=(Apache-2.0)
depends=('glibc') depends=(
makedepends=('go' 'git') glibc
backup=('etc/caddy/Caddyfile') )
makedepends=(
git
go
)
backup=(
etc/caddy/Caddyfile
)
source=("git+https://github.com/caddyserver/caddy.git#tag=v${pkgver}?signed" source=("git+https://github.com/caddyserver/caddy.git#tag=v${pkgver}?signed"
caddy-dist::"git+https://github.com/caddyserver/dist.git#tag=v${pkgver}" caddy-dist::"git+https://github.com/caddyserver/dist.git#tag=v${pkgver}"
caddy.service caddy.service
@ -38,11 +45,6 @@ validpgpkeys=(
29D0817A67156E4F25DC24782A349DD577D586A5 # Matthew Holt <mholt@users.noreply.github.com> 29D0817A67156E4F25DC24782A349DD577D586A5 # Matthew Holt <mholt@users.noreply.github.com>
) )
#pkgver() {
# cd ${pkgname}
# git describe --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
#}
prepare() { prepare() {
cd "${pkgname}" cd "${pkgname}"
# welcome page # welcome page