chore: reformat for easiler diffs and conflict resolution
This commit is contained in:
		
							
								
								
									
										2
									
								
								.SRCINFO
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								.SRCINFO
									
									
									
									
									
								
							@@ -5,8 +5,8 @@ pkgbase = caddy
 | 
			
		||||
	url = https://github.com/caddyserver/caddy
 | 
			
		||||
	arch = x86_64
 | 
			
		||||
	license = Apache-2.0
 | 
			
		||||
	makedepends = go
 | 
			
		||||
	makedepends = git
 | 
			
		||||
	makedepends = go
 | 
			
		||||
	depends = glibc
 | 
			
		||||
	backup = etc/caddy/Caddyfile
 | 
			
		||||
	source = git+https://github.com/caddyserver/caddy.git#tag=v2.10.0?signed
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										20
									
								
								PKGBUILD
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								PKGBUILD
									
									
									
									
									
								
							@@ -11,11 +11,18 @@ pkgver=2.10.0
 | 
			
		||||
pkgrel=2
 | 
			
		||||
pkgdesc='Fast web server with automatic HTTPS'
 | 
			
		||||
url='https://github.com/caddyserver/caddy'
 | 
			
		||||
arch=('x86_64')
 | 
			
		||||
arch=(x86_64)
 | 
			
		||||
license=(Apache-2.0)
 | 
			
		||||
depends=('glibc')
 | 
			
		||||
makedepends=('go' 'git')
 | 
			
		||||
backup=('etc/caddy/Caddyfile')
 | 
			
		||||
depends=(
 | 
			
		||||
  glibc
 | 
			
		||||
)
 | 
			
		||||
makedepends=(
 | 
			
		||||
  git
 | 
			
		||||
  go
 | 
			
		||||
)
 | 
			
		||||
backup=(
 | 
			
		||||
  etc/caddy/Caddyfile
 | 
			
		||||
)
 | 
			
		||||
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.service
 | 
			
		||||
@@ -38,11 +45,6 @@ validpgpkeys=(
 | 
			
		||||
  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() {
 | 
			
		||||
  cd "${pkgname}"
 | 
			
		||||
  # welcome page
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user