mirrors/yay
1
0
Fork 0
mirror of https://github.com/Jguer/yay.git synced 2025-12-27 10:01:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Mutualize local sync install (#1836)

Browse Source 
* fix: do not instantiate cleaning hooks if there's no AUR pkg

* chore: squash local and sync install

* still update completions in local mode
This commit is contained in:
Jo
2022-11-20 13:02:01 +00:00
committed by GitHub
parent 9f67d10d5c
commit 7612bb5da5
4 changed files with 31 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
local_install.go
View File

@@ -11,7 +11,6 @@ import (
"github.com/Jguer/yay/v11/pkg/dep"
"github.com/Jguer/yay/v11/pkg/settings"
"github.com/Jguer/yay/v11/pkg/settings/parser"
"github.com/Jguer/yay/v11/pkg/text"
"github.com/Jguer/yay/v11/pkg/topo"
gosrc "github.com/Morganamilo/go-srcinfo"
@@ -49,42 +48,6 @@ func installLocalPKGBUILD(
}
}
topoSorted := graph.TopoSortedLayerMap()
preparer := &Preparer{
dbExecutor: dbExecutor,
cmdBuilder: config.Runtime.CmdBuilder,
config: config,
}
installer := &Installer{dbExecutor: dbExecutor}
pkgBuildDirs, err := preparer.Run(ctx, os.Stdout, topoSorted)
if err != nil {
return err
}
if cleanFunc := preparer.ShouldCleanMakeDeps(); cleanFunc != nil {
installer.AddPostInstallHook(cleanFunc)
}
if cleanAURDirsFunc := preparer.ShouldCleanAURDirs(pkgBuildDirs); cleanAURDirsFunc != nil {
installer.AddPostInstallHook(cleanAURDirsFunc)
}
srcinfoOp := srcinfoOperator{dbExecutor: dbExecutor}
srcinfos, err := srcinfoOp.Run(pkgBuildDirs)
if err != nil {
return err
}
if err = installer.Install(ctx, cmdArgs, topoSorted, pkgBuildDirs, srcinfos); err != nil {
if errHook := installer.RunPostInstallHooks(ctx); errHook != nil {
text.Errorln(errHook)
}
return err
}
return installer.RunPostInstallHooks(ctx)
opService := NewOperationService(ctx, config, dbExecutor)
return opService.Run(ctx, cmdArgs, graph.TopoSortedLayerMap())
}