diff --git a/pkg/prebuild/cli/cli.go b/pkg/prebuild/cli/cli.go index da19c117..329729e9 100644 --- a/pkg/prebuild/cli/cli.go +++ b/pkg/prebuild/cli/cli.go @@ -61,7 +61,7 @@ func init() { func Prebuild() { flag.Usage = func() { - fmt.Printf("%s%s\n%s\n%s", usage, + fmt.Printf("%s\n%s\n%s\n%s", usage, prebuild.Help("Prepare", prepare.Tasks), prebuild.Help("Build", builder.Builders), directive.Usage(), diff --git a/pkg/prebuild/cli/cli_test.go b/pkg/prebuild/cli/cli_test.go index 782d8175..dab31002 100644 --- a/pkg/prebuild/cli/cli_test.go +++ b/pkg/prebuild/cli/cli_test.go @@ -78,7 +78,7 @@ func Test_Prebuild(t *testing.T) { chdirGitRoot() for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - setTestBuildDirectories(tt.name) + setTestBuildDirectories(tt.dist) prebuild.Distribution = tt.dist prepare.Prepares = []prepare.Task{} prepare.Register( diff --git a/pkg/prebuild/directories.go b/pkg/prebuild/directories.go index 6fbde10b..cd5958b7 100644 --- a/pkg/prebuild/directories.go +++ b/pkg/prebuild/directories.go @@ -10,10 +10,10 @@ var ( // AppArmor ABI version ABI uint = 0 - // Root is the root directory for the build + // Root is the root directory for the build (default: .build) Root *paths.Path = paths.New(".build") - // RootApparmord is the final built apparmor.d directory + // RootApparmord is the final built apparmor.d directory (default: .build/apparmor.d) RootApparmord *paths.Path = Root.Join("apparmor.d") // DistDir is the directory where the distribution specific files are stored