Remove installed build dependencies from list
This commit is contained in:
parent
27fb08d5ba
commit
07e41849e9
20
build.go
20
build.go
|
@ -201,9 +201,21 @@ func buildPackage(ctx context.Context, script string, mgr manager.Manager) ([]st
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(vars.BuildDepends) > 0 {
|
installed, err := mgr.ListInstalled(nil)
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var buildDeps []string
|
||||||
|
for _, pkgName := range vars.BuildDepends {
|
||||||
|
if _, ok := installed[pkgName]; !ok {
|
||||||
|
buildDeps = append(buildDeps, pkgName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(buildDeps) > 0 {
|
||||||
log.Info("Installing build dependencies").Send()
|
log.Info("Installing build dependencies").Send()
|
||||||
installPkgs(ctx, vars.BuildDepends, mgr, false)
|
installPkgs(ctx, buildDeps, mgr, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
var builtDeps, builtNames, repoDeps []string
|
var builtDeps, builtNames, repoDeps []string
|
||||||
|
@ -418,7 +430,7 @@ func buildPackage(ctx context.Context, script string, mgr manager.Manager) ([]st
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(vars.BuildDepends) > 0 {
|
if len(buildDeps) > 0 {
|
||||||
var removeBuildDeps bool
|
var removeBuildDeps bool
|
||||||
err = survey.AskOne(&survey.Confirm{
|
err = survey.AskOne(&survey.Confirm{
|
||||||
Message: "Would you like to remove build dependencies?",
|
Message: "Would you like to remove build dependencies?",
|
||||||
|
@ -433,7 +445,7 @@ func buildPackage(ctx context.Context, script string, mgr manager.Manager) ([]st
|
||||||
AsRoot: true,
|
AsRoot: true,
|
||||||
NoConfirm: true,
|
NoConfirm: true,
|
||||||
},
|
},
|
||||||
vars.BuildDepends...,
|
buildDeps...,
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
|
|
Loading…
Reference in New Issue