Compare commits

...

2 Commits

Author SHA1 Message Date
681e5fa95b Make ubuntu use multiarch tuples
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-07-13 11:17:24 -07:00
53f3265c09 Add install-icon helper 2023-07-13 11:15:02 -07:00

View File

@ -47,6 +47,7 @@ var helpers = shutils.ExecFuncs{
"install-config": installHelperCmd("/etc", 0o644),
"install-license": installHelperCmd("/usr/share/licenses", 0o644),
"install-desktop": installHelperCmd("/usr/share/applications", 0o644),
"install-icon": installHelperCmd("/usr/share/pixmaps", 0o644),
"install-manual": installManualCmd,
"install-completion": installCompletionCmd,
"install-library": installLibraryCmd,
@ -205,10 +206,12 @@ func getLibPrefix(hc interp.HandlerContext) string {
architecture := hc.Env.Get("ARCH").Str
if distroID == "debian" || slices.Contains(distroLike, "debian") {
triple, ok := multiarchTupleMap[architecture]
if distroID == "debian" || slices.Contains(distroLike, "debian") ||
distroID == "ubuntu" || slices.Contains(distroLike, "ubuntu") {
tuple, ok := multiarchTupleMap[architecture]
if ok {
out = filepath.Join("/usr/lib", triple)
out = filepath.Join("/usr/lib", tuple)
}
}