mirror of
https://github.com/roddhjav/apparmor.d.git
synced 2024-11-14 23:43:56 +01:00
build: add a new path variable.
This commit is contained in:
parent
0b7f355269
commit
8cfc6b4574
@ -30,6 +30,7 @@ var (
|
||||
Full bool
|
||||
Complain bool
|
||||
Distribution string
|
||||
DistDir *paths.Path
|
||||
Root *paths.Path
|
||||
RootApparmord *paths.Path
|
||||
|
||||
@ -44,6 +45,7 @@ type prepareFunc func() error
|
||||
type buildFunc func(string) string
|
||||
|
||||
func init() {
|
||||
DistDir = paths.New("dists")
|
||||
Root = paths.New(".build")
|
||||
RootApparmord = Root.Join("apparmor.d")
|
||||
Distribution, _ = util.GetSupportedDistribution()
|
||||
|
@ -37,7 +37,7 @@ func Synchronise() error {
|
||||
// Ignore profiles and files as defined in dists/ignore/
|
||||
func Ignore() error {
|
||||
for _, name := range []string{"main.ignore", Distribution + ".ignore"} {
|
||||
path := paths.New("dists/ignore/" + name)
|
||||
path := DistDir.Join("ignore", name)
|
||||
if !path.Exist() {
|
||||
continue
|
||||
}
|
||||
@ -186,7 +186,7 @@ func copyTo(src *paths.Path, dst *paths.Path) error {
|
||||
// Set flags on some profiles according to manifest defined in `dists/flags/`
|
||||
func SetFlags() error {
|
||||
for _, name := range []string{"main.flags", Distribution + ".flags"} {
|
||||
path := paths.New("dists/flags/" + name)
|
||||
path := DistDir.Join("flags", name)
|
||||
if !path.Exist() {
|
||||
continue
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user