felipe/apparmor.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refractor(build): move os logic to its own module.

Browse source
This commit is contained in:
Alexandre Pujol 2024-03-21 18:58:32 +00:00
parent 662dd1c6dc
commit e1d1d0be3d
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
9 changed files with 158 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pkg/prebuild/prepare.go
View file

@ -12,6 +12,7 @@ import (
"github.com/arduino/go-paths-helper"
"github.com/roddhjav/apparmor.d/pkg/logging"
oss "github.com/roddhjav/apparmor.d/pkg/os"
"github.com/roddhjav/apparmor.d/pkg/util"
)
@ -59,7 +60,7 @@ func Synchronise() ([]string, error) {
// Ignore profiles and files as defined in dists/ignore/
func Ignore() ([]string, error) {
res := []string{}
for _, name := range []string{"main.ignore", Distribution + ".ignore"} {
for _, name := range []string{"main.ignore", oss.Distribution + ".ignore"} {
path := DistDir.Join("ignore", name)
if !path.Exist() {
continue
@ -130,7 +131,7 @@ func Merge() ([]string, error) {
// Set the distribution specificities
func Configure() ([]string, error) {
res := []string{}
switch Distribution {
switch oss.Distribution {
case "arch", "opensuse":
case "ubuntu":
@ -152,7 +153,7 @@ func Configure() ([]string, error) {
}
default:
return []string{}, fmt.Errorf("%s is not a supported distribution", Distribution)
return []string{}, fmt.Errorf("%s is not a supported distribution", oss.Distribution)
}
return res, nil
@ -161,7 +162,7 @@ func Configure() ([]string, error) {
// Set flags on some profiles according to manifest defined in `dists/flags/`
func SetFlags() ([]string, error) {
res := []string{}
for _, name := range []string{"main.flags", Distribution + ".flags"} {
for _, name := range []string{"main.flags", oss.Distribution + ".flags"} {
path := FlagDir.Join(name)
if !path.Exist() {
continue