e2e-tests/issue_32_interactive_test.go

@@ -31,21 +31,10 @@ func TestE2EIssue32Interactive(t *testing.T) {
 		"issue-32-interactive",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			assert.NoError(t, r.Exec(e2e.NewCommand(
+			err := r.Exec(e2e.NewCommand(
 				"sudo", "alr", "--interactive=false", "remove", "ca-certificates",
-			)))
+			))
-
+			assert.NoError(t, err)
-			assert.NoError(t, r.Exec(e2e.NewCommand(
-				"sudo", "alr", "--interactive=false", "remove", "openssl",
-			)))
-
-			assert.NoError(t, r.Exec(e2e.NewCommand(
-				"alr", "fix",
-			)))
-
-			assert.NoError(t, r.Exec(e2e.NewCommand(
-				"sudo", "alr", "--interactive=false", "install", "ca-certificates",
-			)))
 		},
 	)
 }

internal/cliutils/utils.go

@@ -46,9 +46,6 @@ func HandleExitCoder(err error) {
 		cli.OsExiter(exitErr.ExitCode())
 		return
 	}
-
-	slog.Error(err.Error())
-	cli.OsExiter(1)
 }
 
 func FormatCliExit(msg string, err error) cli.ExitCoder {

internal/translations/default.pot

@@ -347,19 +347,19 @@ msgstr ""
 msgid "Error while running app"
 msgstr ""
 
-#: pkg/build/build.go:395
+#: pkg/build/build.go:394
 msgid "Building package"
 msgstr ""
 
-#: pkg/build/build.go:424
+#: pkg/build/build.go:423
 msgid "The checksums array must be the same length as sources"
 msgstr ""
 
-#: pkg/build/build.go:455
+#: pkg/build/build.go:454
 msgid "Downloading sources"
 msgstr ""
 
-#: pkg/build/build.go:549
+#: pkg/build/build.go:543
 msgid "Installing dependencies"
 msgstr ""
 

internal/translations/po/ru/default.po

@@ -363,19 +363,19 @@ msgstr "Показать справку"
 msgid "Error while running app"
 msgstr "Ошибка при запуске приложения"
 
-#: pkg/build/build.go:395
+#: pkg/build/build.go:394
 msgid "Building package"
 msgstr "Сборка пакета"
 
-#: pkg/build/build.go:424
+#: pkg/build/build.go:423
 msgid "The checksums array must be the same length as sources"
 msgstr "Массив контрольных сумм должен быть той же длины, что и источники"
 
-#: pkg/build/build.go:455
+#: pkg/build/build.go:454
 msgid "Downloading sources"
 msgstr "Скачивание источников"
 
-#: pkg/build/build.go:549
+#: pkg/build/build.go:543
 msgid "Installing dependencies"
 msgstr "Установка зависимостей"
 

pkg/build/build.go

@@ -35,7 +35,6 @@ import (
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 )
 
 type BuildInput struct {
@@ -234,8 +233,8 @@ type CheckerExecutor interface {
 }
 
 type InstallerExecutor interface {
-	InstallLocal(paths []string, opts *manager.Opts) error
+	InstallLocal(paths []string) error
-	Install(pkgs []string, opts *manager.Opts) error
+	Install(pkgs []string) error
 	RemoveAlreadyInstalled(pkgs []string) ([]string, error)
 }
 
@@ -522,12 +521,7 @@ func (b *Builder) InstallALRPackages(
 			return err
 		}
 
-		err = b.installerExecutor.InstallLocal(
+		err = b.installerExecutor.InstallLocal(res.PackagePaths)
-			res.PackagePaths,
-			&manager.Opts{
-				NoConfirm: !input.BuildOpts().Interactive,
-			},
-		)
 		if err != nil {
 			return err
 		}
@@ -687,18 +681,14 @@ func (i *Builder) InstallPkgs(
 	}
 
 	if len(builtPaths) > 0 {
-		err = i.installerExecutor.InstallLocal(builtPaths, &manager.Opts{
+		err = i.installerExecutor.InstallLocal(builtPaths)
-			NoConfirm: !input.BuildOpts().Interactive,
-		})
 		if err != nil {
 			return err
 		}
 	}
 
 	if len(repoDeps) > 0 {
-		err = i.installerExecutor.Install(repoDeps, &manager.Opts{
+		err = i.installerExecutor.Install(repoDeps)
-			NoConfirm: !input.BuildOpts().Interactive,
-		})
 		if err != nil {
 			return err
 		}

pkg/build/installer.go

@@ -28,12 +28,12 @@ func NewInstaller(mgr manager.Manager) *Installer {
 
 type Installer struct{ mgr manager.Manager }
 
-func (i *Installer) InstallLocal(paths []string, opts *manager.Opts) error {
+func (i *Installer) InstallLocal(paths []string) error {
-	return i.mgr.InstallLocal(opts, paths...)
+	return i.mgr.InstallLocal(nil, paths...)
 }
 
-func (i *Installer) Install(pkgs []string, opts *manager.Opts) error {
+func (i *Installer) Install(pkgs []string) error {
-	return i.mgr.Install(opts, pkgs...)
+	return i.mgr.Install(nil, pkgs...)
 }
 
 func (i *Installer) RemoveAlreadyInstalled(pkgs []string) ([]string, error) {

pkg/build/safe_common.go

@@ -1,40 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 Евгений Храмов
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package build
-
-import (
-	"os"
-	"os/exec"
-	"strings"
-)
-
-func setCommonCmdEnv(cmd *exec.Cmd) {
-	cmd.Env = []string{
-		"HOME=/var/cache/alr",
-		"LOGNAME=alr",
-		"USER=alr",
-		"PATH=/usr/bin:/bin:/usr/local/bin",
-	}
-	for _, env := range os.Environ() {
-		if strings.HasPrefix(env, "LANG=") ||
-			strings.HasPrefix(env, "LANGUAGE=") ||
-			strings.HasPrefix(env, "LC_") ||
-			strings.HasPrefix(env, "ALR_LOG_LEVEL=") {
-			cmd.Env = append(cmd.Env, env)
-		}
-	}
-}

pkg/build/safe_installer.go

@@ -28,7 +28,6 @@ import (
 	"github.com/hashicorp/go-plugin"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/logger"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 )
 
 type InstallerPlugin struct {
@@ -43,31 +42,21 @@ type InstallerRPCServer struct {
 	Impl InstallerExecutor
 }
 
-type InstallArgs struct {
+func (r *InstallerRPC) InstallLocal(paths []string) error {
-	PackagesOrPaths []string
+	return r.client.Call("Plugin.InstallLocal", paths, nil)
-	Opts            *manager.Opts
 }
 
-func (r *InstallerRPC) InstallLocal(paths []string, opts *manager.Opts) error {
+func (s *InstallerRPCServer) InstallLocal(paths []string, reply *struct{}) error {
-	return r.client.Call("Plugin.InstallLocal", &InstallArgs{
+	return s.Impl.InstallLocal(paths)
-		PackagesOrPaths: paths,
-		Opts:            opts,
-	}, nil)
 }
 
-func (s *InstallerRPCServer) InstallLocal(args *InstallArgs, reply *struct{}) error {
+func (r *InstallerRPC) Install(pkgs []string) error {
-	return s.Impl.InstallLocal(args.PackagesOrPaths, args.Opts)
+	return r.client.Call("Plugin.Install", pkgs, nil)
 }
 
-func (r *InstallerRPC) Install(pkgs []string, opts *manager.Opts) error {
+func (s *InstallerRPCServer) Install(pkgs []string, reply *struct{}) error {
-	return r.client.Call("Plugin.Install", &InstallArgs{
+	slog.Debug("install", "pkgs", pkgs)
-		PackagesOrPaths: pkgs,
+	return s.Impl.Install(pkgs)
-		Opts:            opts,
-	}, nil)
-}
-
-func (s *InstallerRPCServer) Install(args *InstallArgs, reply *struct{}) error {
-	return s.Impl.Install(args.PackagesOrPaths, args.Opts)
 }
 
 func (r *InstallerRPC) RemoveAlreadyInstalled(paths []string) ([]string, error) {
@@ -101,7 +90,28 @@ func GetSafeInstaller() (InstallerExecutor, func(), error) {
 		return nil, nil, err
 	}
 	cmd := exec.Command(executable, "_internal-installer")
-	setCommonCmdEnv(cmd)
+	cmd.Env = []string{
+		"HOME=/var/cache/alr",
+		"LOGNAME=alr",
+		"USER=alr",
+		"PATH=/usr/bin:/bin:/usr/local/bin",
+		"ALR_LOG_LEVEL=DEBUG",
+	}
+
+	/*
+		uid, gid, err := utils.GetUidGidAlrUser()
+		if err != nil {
+			return nil, nil, err
+		}
+
+
+			cmd.SysProcAttr = &syscall.SysProcAttr{
+				Credential: &syscall.Credential{
+					Uid: uint32(uid),
+					Gid: uint32(gid),
+				},
+			}
+	*/
 
 	slog.Debug("safe installer setup", "uid", syscall.Getuid(), "gid", syscall.Getgid())
 

pkg/build/safe_script_executor.go

@@ -226,7 +226,26 @@ func GetSafeScriptExecutor() (ScriptExecutor, func(), error) {
 	}
 
 	cmd := exec.Command(executable, "_internal-safe-script-executor")
-	setCommonCmdEnv(cmd)
+	cmd.Env = []string{
+		"HOME=/var/cache/alr",
+		"LOGNAME=alr",
+		"USER=alr",
+		"PATH=/usr/bin:/bin:/usr/local/bin",
+		"ALR_LOG_LEVEL=DEBUG",
+	}
+	/*
+		uid, gid, err := utils.GetUidGidAlrUser()
+		if err != nil {
+			return nil, nil, err
+		}
+
+			cmd.SysProcAttr = &syscall.SysProcAttr{
+				Credential: &syscall.Credential{
+					Uid: uint32(uid),
+					Gid: uint32(gid),
+				},
+			}
+	*/
 
 	client := plugin.NewClient(&plugin.ClientConfig{
 		HandshakeConfig: HandshakeConfig,