|
|
@@ -15,9 +15,12 @@ import (
|
|
|
"github.com/Jguer/yay/v11/pkg/settings"
|
|
|
"github.com/Jguer/yay/v11/pkg/settings/exe"
|
|
|
"github.com/Jguer/yay/v11/pkg/settings/parser"
|
|
|
- gosrc "github.com/Morganamilo/go-srcinfo"
|
|
|
+ "github.com/Jguer/yay/v11/pkg/text"
|
|
|
"github.com/leonelquinteros/gotext"
|
|
|
"github.com/pkg/errors"
|
|
|
+
|
|
|
+ gosrc "github.com/Morganamilo/go-srcinfo"
|
|
|
+ mapset "github.com/deckarep/golang-set/v2"
|
|
|
)
|
|
|
|
|
|
var ErrInstallRepoPkgs = errors.New(gotext.Get("error installing repo packages"))
|
|
|
@@ -52,7 +55,7 @@ func installLocalPKGBUILD(
|
|
|
|
|
|
grapher := dep.NewGrapher(dbExecutor, aurCache, false, settings.NoConfirm, os.Stdout)
|
|
|
|
|
|
- graph, err := grapher.GraphFromSrcInfo(pkgbuild)
|
|
|
+ graph, err := grapher.GraphFromSrcInfo(wd, pkgbuild)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|
|
|
@@ -71,9 +74,10 @@ func installLocalPKGBUILD(
|
|
|
}
|
|
|
|
|
|
type Preparer struct {
|
|
|
- dbExecutor db.Executor
|
|
|
- cmdBuilder exe.ICmdBuilder
|
|
|
- aurBases []string
|
|
|
+ dbExecutor db.Executor
|
|
|
+ cmdBuilder exe.ICmdBuilder
|
|
|
+ aurBases []string
|
|
|
+ pkgBuildDirs []string
|
|
|
}
|
|
|
|
|
|
func (preper *Preparer) PrepareWorkspace(ctx context.Context, targets []map[string]*dep.InstallInfo,
|
|
|
@@ -82,16 +86,22 @@ func (preper *Preparer) PrepareWorkspace(ctx context.Context, targets []map[stri
|
|
|
for pkgBase, info := range layer {
|
|
|
if info.Source == dep.AUR {
|
|
|
preper.aurBases = append(preper.aurBases, pkgBase)
|
|
|
+ preper.pkgBuildDirs = append(preper.pkgBuildDirs, filepath.Join(config.BuildDir, pkgBase))
|
|
|
+ } else if info.Source == dep.SrcInfo {
|
|
|
+ preper.pkgBuildDirs = append(preper.pkgBuildDirs, *info.SrcinfoPath)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- _, errA := download.AURPKGBUILDRepos(ctx,
|
|
|
- preper.cmdBuilder, preper.aurBases, config.AURURL, config.BuildDir, false)
|
|
|
- if errA != nil {
|
|
|
+ if _, errA := download.AURPKGBUILDRepos(ctx,
|
|
|
+ preper.cmdBuilder, preper.aurBases, config.AURURL, config.BuildDir, false); errA != nil {
|
|
|
return errA
|
|
|
}
|
|
|
|
|
|
+ if errP := downloadPKGBUILDSourceFanout(ctx, config.Runtime.CmdBuilder,
|
|
|
+ preper.pkgBuildDirs, false, config.MaxConcurrentDownloads); errP != nil {
|
|
|
+ text.Errorln(errP)
|
|
|
+ }
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
@@ -144,9 +154,28 @@ func (installer *Installer) handleLayer(ctx context.Context, cmdArgs *parser.Arg
|
|
|
syncDeps, syncExp := make([]string, 0), make([]string, 0)
|
|
|
repoTargets := make([]string, 0)
|
|
|
|
|
|
+ aurDeps, aurExp := mapset.NewSet[string](), mapset.NewSet[string]()
|
|
|
for source, reasons := range depByTypeAndReason {
|
|
|
switch source {
|
|
|
case dep.AUR:
|
|
|
+ for reason, names := range reasons {
|
|
|
+ for _, name := range names {
|
|
|
+ switch reason {
|
|
|
+ case dep.Explicit:
|
|
|
+ if cmdArgs.ExistsArg("asdeps", "asdep") {
|
|
|
+ aurDeps.Add(name)
|
|
|
+ } else {
|
|
|
+ aurExp.Add(name)
|
|
|
+ }
|
|
|
+ case dep.CheckDep:
|
|
|
+ fallthrough
|
|
|
+ case dep.MakeDep:
|
|
|
+ fallthrough
|
|
|
+ case dep.Dep:
|
|
|
+ aurDeps.Add(name)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
case dep.Sync:
|
|
|
for reason, names := range reasons {
|
|
|
switch reason {
|
|
|
@@ -171,7 +200,7 @@ func (installer *Installer) handleLayer(ctx context.Context, cmdArgs *parser.Arg
|
|
|
|
|
|
fmt.Println(syncDeps, syncExp)
|
|
|
|
|
|
- errShow := installer.installRepoPackages(ctx, cmdArgs, repoTargets, syncDeps, syncExp)
|
|
|
+ errShow := installer.installSyncPackages(ctx, cmdArgs, repoTargets, syncDeps, syncExp)
|
|
|
if errShow != nil {
|
|
|
return ErrInstallRepoPkgs
|
|
|
}
|
|
|
@@ -179,7 +208,86 @@ func (installer *Installer) handleLayer(ctx context.Context, cmdArgs *parser.Arg
|
|
|
return nil
|
|
|
}
|
|
|
|
|
|
-func (*Installer) installRepoPackages(ctx context.Context, cmdArgs *parser.Arguments,
|
|
|
+func (*Installer) installAURPackages(ctx context.Context, cmdArgs *parser.Arguments, aurBaseDeps, aurBaseExp mapset.Set[string], pkgBuildDirs map[string]string, installIncompatible bool) error {
|
|
|
+ deps, exp := make([]string, 0, aurBaseDeps.Cardinality()), make([]string, 0, aurBaseExp.Cardinality())
|
|
|
+ for _, base := range aurBaseDeps.Union(aurBaseExp).ToSlice() {
|
|
|
+ dir := pkgBuildDirs[base]
|
|
|
+ args := []string{"--nobuild", "-fC"}
|
|
|
+
|
|
|
+ if installIncompatible {
|
|
|
+ args = append(args, "--ignorearch")
|
|
|
+ }
|
|
|
+
|
|
|
+ // pkgver bump
|
|
|
+ if err := config.Runtime.CmdBuilder.Show(
|
|
|
+ config.Runtime.CmdBuilder.BuildMakepkgCmd(ctx, dir, args...)); err != nil {
|
|
|
+ return errors.New(gotext.Get("error making: %s", base))
|
|
|
+ }
|
|
|
+
|
|
|
+ pkgdests, _, errList := parsePackageList(ctx, dir)
|
|
|
+ if errList != nil {
|
|
|
+ return errList
|
|
|
+ }
|
|
|
+
|
|
|
+ args = []string{"-cf", "--noconfirm", "--noextract", "--noprepare", "--holdver"}
|
|
|
+
|
|
|
+ if installIncompatible {
|
|
|
+ args = append(args, "--ignorearch")
|
|
|
+ }
|
|
|
+
|
|
|
+ if errMake := config.Runtime.CmdBuilder.Show(
|
|
|
+ config.Runtime.CmdBuilder.BuildMakepkgCmd(ctx,
|
|
|
+ dir, args...)); errMake != nil {
|
|
|
+ return errors.New(gotext.Get("error making: %s", base))
|
|
|
+ }
|
|
|
+
|
|
|
+ for suffix, optional := range map[string]bool{"": false, "-debug": true} {
|
|
|
+ newDeps, newExp, err := getNewTargets(cmdArgs, pkgdests, base+suffix, aurBaseDeps.Contains(base), optional)
|
|
|
+ if err != nil {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ deps = append(deps, newDeps...)
|
|
|
+ exp = append(exp, newExp...)
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if err := doInstall(ctx, cmdArgs, deps, exp); err != nil {
|
|
|
+ return errors.New(fmt.Sprintf(gotext.Get("error installing:")+" %v %v", deps, exp))
|
|
|
+ }
|
|
|
+
|
|
|
+ return nil
|
|
|
+}
|
|
|
+
|
|
|
+func getNewTargets(cmdArgs *parser.Arguments, pkgdests map[string]string, name string, isDep, optional bool,
|
|
|
+) (deps, exp []string, err error) {
|
|
|
+ for pkgName, pkgDest := range pkgdests {
|
|
|
+ if _, errStat := os.Stat(pkgDest); os.IsNotExist(errStat) {
|
|
|
+ if optional {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+
|
|
|
+ return deps, exp, errors.New(
|
|
|
+ gotext.Get(
|
|
|
+ "the PKGDEST for %s is listed by makepkg but does not exist: %s",
|
|
|
+ pkgName, pkgDest))
|
|
|
+ }
|
|
|
+
|
|
|
+ switch {
|
|
|
+ case cmdArgs.ExistsArg("asdeps", "asdep"):
|
|
|
+ deps = append(deps, name)
|
|
|
+ case cmdArgs.ExistsArg("asexplicit", "asexp"):
|
|
|
+ exp = append(exp, name)
|
|
|
+ case isDep:
|
|
|
+ deps = append(deps, name)
|
|
|
+ default:
|
|
|
+ exp = append(exp, name)
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return deps, exp, nil
|
|
|
+}
|
|
|
+
|
|
|
+func (*Installer) installSyncPackages(ctx context.Context, cmdArgs *parser.Arguments,
|
|
|
repoTargets, // all repo targets
|
|
|
syncDeps, // repo targets that are deps
|
|
|
syncExp []string, // repo targets that are exp
|
|
|
@@ -191,6 +299,7 @@ func (*Installer) installRepoPackages(ctx context.Context, cmdArgs *parser.Argum
|
|
|
arguments.Op = "S"
|
|
|
arguments.ClearTargets()
|
|
|
arguments.AddTarget(repoTargets...)
|
|
|
+
|
|
|
errShow := config.Runtime.CmdBuilder.Show(config.Runtime.CmdBuilder.BuildPacmanCmd(ctx,
|
|
|
arguments, config.Runtime.Mode, settings.NoConfirm))
|
|
|
|
jguer