This commit is contained in:
2025-04-15 10:34:07 +03:00
parent 35982a0ae7
commit 6df5baa457
10 changed files with 63 additions and 55 deletions

View File

@ -20,20 +20,13 @@ import (
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
)
func NewInstaller(
repos PackageFinder,
mgr manager.Manager,
) *Installer {
func NewInstaller(mgr manager.Manager) *Installer {
return &Installer{
repos: repos,
mgr: mgr,
mgr: mgr,
}
}
type Installer struct {
repos PackageFinder
mgr manager.Manager
}
type Installer struct{ mgr manager.Manager }
func (i *Installer) InstallLocal(paths []string) error {
return i.mgr.InstallLocal(nil, paths...)

View File

@ -91,18 +91,19 @@ func GetSafeInstaller() (InstallerExecutor, func(), error) {
return nil, nil, err
}
cmd := exec.Command(executable, "_internal-installer")
cmd.Env = append(os.Environ(),
cmd.Env = []string{
"HOME=/var/cache/alr",
"LOGNAME=alr",
"USER=alr",
"PATH=/usr/bin:/bin:/usr/local/bin",
"ALR_LOG_LEVEL=DEBUG",
"XDG_SESSION_CLASS=user",
)
}
uid, gid, err := utils.GetUidGidAlrUser()
if err != nil {
return nil, nil, err
}
cmd.SysProcAttr = &syscall.SysProcAttr{
Credential: &syscall.Credential{
Uid: uint32(uid),