diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-04-02 22:42:16 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-04-02 22:42:16 +0900 |
| commit | 15bff9e1a687b9bc4c53f336bfc8fd70528d872f (patch) | |
| tree | b8091521dc8fc6d079ffc2a508fe142b1c9c6c29 /internal | |
| parent | b948525c07fe642bee043a297db323f5825bc1a3 (diff) | |
internal/rosa/git: determine reporting name from url
This is generally correct, and is a lot cleaner to call.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/rosa/git.go | 8 | ||||
| -rw-r--r-- | internal/rosa/p11.go | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/internal/rosa/git.go b/internal/rosa/git.go index 65ebd97b..ad3f5b91 100644 --- a/internal/rosa/git.go +++ b/internal/rosa/git.go @@ -2,6 +2,7 @@ package rosa import ( "path" + "strings" "hakurei.app/internal/pkg" ) @@ -91,10 +92,13 @@ func init() { // NewViaGit returns a [pkg.Artifact] for cloning a git repository. func (t Toolchain) NewViaGit( - name, url, rev string, + url, rev string, checksum pkg.Checksum, ) pkg.Artifact { - return t.New(name+"-"+path.Base(rev), 0, t.AppendPresets(nil, + return t.New(strings.TrimSuffix( + path.Base(url), + ".git", + )+"-src-"+path.Base(rev), 0, t.AppendPresets(nil, NSSCACert, Git, ), &checksum, nil, ` diff --git a/internal/rosa/p11.go b/internal/rosa/p11.go index d20449c0..70fe9419 100644 --- a/internal/rosa/p11.go +++ b/internal/rosa/p11.go @@ -8,7 +8,7 @@ func (t Toolchain) newP11Kit() (pkg.Artifact, string) { checksum = "3ei-6DUVtYzrRVe-SubtNgRlweXd6H2qHmUu-_5qVyIn6gSTvZbGS2u79Y8IFb2N" ) return t.NewPackage("p11-kit", version, t.NewViaGit( - "p11-kit-src", "https://github.com/p11-glue/p11-kit.git", + "https://github.com/p11-glue/p11-kit.git", "refs/tags/"+version, mustDecode(checksum), ), nil, &MesonHelper{ Setup: []KV{ |