wip
This commit is contained in:
@ -266,14 +266,32 @@ func (b *Builder) executeFirstPass(
|
||||
}
|
||||
|
||||
dec := decoder.New(b.info, runner) // Создаём новый декодер
|
||||
|
||||
type packages struct {
|
||||
BasePkgName string `sh:"basepkg_name"`
|
||||
Names []string `sh:"name"`
|
||||
}
|
||||
|
||||
var pkgs packages
|
||||
err = dec.DecodeVars(&pkgs)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(pkgs.Names) == 0 {
|
||||
return nil, errors.New("package name is missing")
|
||||
}
|
||||
var vars types.BuildVars
|
||||
if b.opts.Package == "" {
|
||||
if len(pkgs.Names) == 1 {
|
||||
err = dec.DecodeVars(&vars) // Декодируем переменные
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &vars, nil
|
||||
}
|
||||
if b.opts.Package == "" {
|
||||
return nil, errors.New("script has multiple packages but package is not specified")
|
||||
}
|
||||
|
||||
var preVars types.BuildVarsPre
|
||||
funcName := fmt.Sprintf("meta_%s", b.opts.Package)
|
||||
meta, ok := dec.GetFuncSub(funcName)
|
||||
|
Reference in New Issue
Block a user