Commit 851db77

CorySaninGiteaBot

and

authored

Fix Arch repo pacman.conf snippet (#35825)

Current template uses the owner followed by the instance URL as the repo name. Technically this can work if the repo happens to be named the exact same way. But if, for example, you follow [the docs](https://docs.gitea.com/usage/packages/arch/#publish-a-package), you'll end up with a package in `core` while the pacman conf refers to a non-existent repo `testuser.gitea.example.com`. Whatever is in the square brackets get substituted in for `$repo`, so we do not want anything except the exact repo name there. And since it's now referring to the repo and not the owner, I've updated the pacman conf to show all repositories. --------- Co-authored-by: Giteabot <teabot@gitea.io>

1 parent 2be51d0 commit 851db77Copy full SHA for 851db77

File tree

1 file changed

-2

lines changed

templates/package/content
- arch.tmpl

1 file changed

-2

lines changed

`‎templates/package/content/arch.tmpl‎`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,11 @@`
`4`	`4`	`<div class="ui form">`
`5`	`5`	`<div class="field">`
`6`	`6`	`<label>{{svg "octicon-gear"}} {{ctx.Locale.Tr "packages.arch.registry"}}</label>`
`7`		`- <div class="markup"><pre class="code-block"><code>[{{.PackageDescriptor.Owner.LowerName}}.{{.PackageRegistryHost}}]`
	`7`	`+ <div class="markup"><pre class="code-block"><code>{{range $i, $repo := .Repositories}}{{if $i}}`
	`8`	`+{{end}}[{{$repo}}]`
`8`	`9`	`SigLevel = Optional TrustAll`
`9`		`-Server = <origin-url data-url="{{AppSubUrl}}/api/packages/{{.PackageDescriptor.Owner.Name}}/arch/$repo/$arch"></origin-url></code></pre></div>`
	`10`	`+Server = <origin-url data-url="{{AppSubUrl}}/api/packages/{{$.PackageDescriptor.Owner.Name}}/arch/$repo/$arch"></origin-url>`
	`11`	`+{{end}}</code></pre></div>`
`10`	`12`	`</div>`
`11`	`13`	`<div class="field">`
`12`	`14`	`<label>{{svg "octicon-sync"}} {{ctx.Locale.Tr "packages.arch.install"}}</label>`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 851db77

File tree

1 file changed

1 file changed

`‎templates/package/content/arch.tmpl‎`

0 commit comments