Merge pull request 'fix install bash completion' (#63) from Maks1mS/ALR:fix-install-bash-complete into master

Reviewed-on: #63

.gitignore

@@ -8,3 +8,5 @@
 .gigaide
 
 *.out
+
+e2e-tests/alr

.golangci.yml

@@ -47,4 +47,4 @@ issues:
     # TODO: remove
     - linters:
         - staticcheck
-      text: "SA1019:"
+      text: "SA1019: interp.ExecHandler"

Makefile

@@ -21,7 +21,7 @@ build: check-no-root $(BIN)
 
 export CGO_ENABLED := 0
 $(BIN):
-	go build -ldflags="-X 'gitea.plemya-x.ru/xpamych/ALR/internal/config.Version=$(GIT_VERSION)'" -o $@
+	go build -ldflags="-X 'gitea.plemya-x.ru/Plemya-x/ALR/internal/config.Version=$(GIT_VERSION)'" -o $@
 
 check-no-root:
 	@if [[ "$$(whoami)" == 'root' ]]; then \
@@ -66,7 +66,13 @@ i18n:
 	$(XGOTEXT_BIN)  --output ./internal/translations/default.pot
 	msguniq --use-first -o ./internal/translations/default.pot ./internal/translations/default.pot
 	msgmerge --backup=off -U ./internal/translations/po/ru/default.po ./internal/translations/default.pot
+	bash scripts/i18n-badge.sh
 
 test-coverage:
 	go test ./... -v -coverpkg=./... -coverprofile=coverage.out
 	bash scripts/coverage-badge.sh
+
+e2e-test: clean build
+	rm -f ./e2e-tests/alr
+	cp alr e2e-tests
+	go test -tags=e2e ./...

README.md

@@ -3,13 +3,13 @@
 </p>
 <b></b>
 
-[![Go Report Card](https://goreportcard.com/badge/gitea.plemya-x.ru/Plemya-x/ALR)](https://goreportcard.com/report/gitea.plemya-x.ru/Plemya-x/ALR) ![Test coverage](./coverage-badge.svg)
+[![Go Report Card](https://goreportcard.com/badge/gitea.plemya-x.ru/Plemya-x/ALR)](https://goreportcard.com/report/gitea.plemya-x.ru/Plemya-x/ALR) ![Test coverage](./assets/coverage-badge.svg) ![ru translate](./assets/i18n-ru-badge.svg)
 
 # ALR (Any Linux Repository)
 
-ALR - это независимая от дистрибутива система сборки для Linux, аналогичная [AUR](https://wiki.archlinux.org/title/Arch_User_Repository). В настоящее время она находится в стадии бета-тестирования. Исправлено большинство основных ошибок и добавлено большинство важных функций. alr готов к общему использованию, но все еще может время от времени ломаться или заменяться.
+ALR - это независимая от дистрибутива система сборки для Linux (форк [LURE](https://github.com/lure-sh/lure), аналогичная [AUR](https://wiki.archlinux.org/title/Arch_User_Repository). В настоящее время она находится в стадии бета-тестирования. Исправлено большинство основных ошибок и добавлено большинство важных функций. ALR готов к общему использованию, но все еще может время от времени ломаться или изменяться.
 
-ALR написан на чистом Go и после сборки не имеет зависимостей. Единственное, для повышения привилегий ALR требуется команда, такая как `sudo`, `doas` и т.д., а также поддерживаемый менеджер пакетов. В настоящее время ALR поддерживает `apt`, `pacman`, `apk`, `dnf`, `yum`, and `zypper`. Если в вашей системе существует поддерживаемый менеджер пакетов, он будет обнаружен и использован автоматически.
+ALR написан на чистом Go и после сборки не имеет зависимостей. Для повышения привилегий ALR требуется команда, такая как `sudo`, `doas` и т.д., а также поддерживаемый менеджер пакетов. В настоящее время ALR поддерживает `apt`, `apt-get` `pacman`, `apk`, `dnf`, `yum`, and `zypper`. Если в вашей системе используется поддерживаемый менеджер пакетов, то он будет обнаружен и использован автоматически.
 
 ---
 
@@ -23,14 +23,14 @@ ALR написан на чистом Go и после сборки не имее
 curl -fsSL plemya-x.ru/alr/install.sh | bash
 ```
 
-**ВАЖНО**: При этом скрипт будет загружен и запущен с <https://gitea.plemya-x.ru/Plemya-x/ALR/src/branch/master/scripts/install.sh>. Пожалуйста, просматривайте любые скрипты, которые вы скачиваете из Интернета (включая этот), прежде чем запускать их.
+**ВАЖНО**: При этом скрипт будет загружен и запущен с <https://plemya-x.ru/alr/install.sh>. Пожалуйста, просматривайте любые скрипты, которые вы скачиваете из Интернета (включая этот), прежде чем запускать их.
 
 ### Сборка из исходного кода
 
 Чтобы собрать ALR из исходного кода, вам понадобится версия Go 1.18 или новее. Как только Go будет установлен, клонируйте это репозиторий и запустите:
 
 ```shell
-make build
+make build -B
 sudo make install
 ```
 
@@ -44,20 +44,23 @@ ALR был создан потому, что упаковка программн
 
 ## Документация
 
-Документация по всем этим вопросам находится в [Wiki](https://gitea.plemya-x.ru/xpamych/ALR/wiki/Home).
+Документация находится в [Wiki](https://disc.plemya-x.ru/c/alr/wiki-alr).
 
 ---
 
 ## Репозитории
 
-Репозитории alr - это git-хранилища, которые содержат каталог для каждого пакета с файлом `alr.sh` внутри. Файл `alr.sh` содержит все инструкции по сборке пакета и информацию о нем. Скрипты `alr.sh` аналогичны скриптам Aur PKGBUILD. Репозиторий [по-умолчанию](https://gitea.plemya-x.ru/xpamych/xpamych-alr-repo.git).
+Репозитории alr - это git-хранилища, которые содержат каталог для каждого пакета с файлом `alr.sh` внутри. Файл `alr.sh` содержит все инструкции по сборке пакета и информацию о нем. Скрипты `alr.sh` аналогичны скриптам Aur PKGBUILD. 
+
+Например, репозиторий [Plemya-x/alr-repo](https://gitea.plemya-x.ru/Plemya-x/alr-repo.git) можно подключить так:
+```
+alr addrepo --name alr-repo --url https://gitea.plemya-x.ru/Plemya-x/alr-repo.git
+```
 
 ---
 ## Соцсети
 VK - https://vk.com/plemya_kh
 
-Discord - https://discord.com/channels/817759634105827358/1261631565084233749
-
 Telegram - https://t.me/plemyakh
 
 ## Спасибы
@@ -70,3 +73,6 @@ Telegram - https://t.me/plemyakh
 - <https://github.com/goreleaser/nfpm>
 - <https://github.com/charmbracelet/bubbletea>
 - <https://gitlab.com/cznic/sqlite>
+
+Благодарим за активное участие в развитии проекта:
+- Maks1mS <maxim@slipenko.com>

assets/coverage-badge.svg

@@ -11,7 +11,7 @@
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
         <text x="33.5" y="15" fill="#010101" fill-opacity=".3">coverage</text>
         <text x="33.5" y="14">coverage</text>
-        <text x="86" y="15" fill="#010101" fill-opacity=".3">19.2%</text>
-        <text x="86" y="14">19.2%</text>
+        <text x="86" y="15" fill="#010101" fill-opacity=".3">19.4%</text>
+        <text x="86" y="14">19.4%</text>
     </g>
 </svg>

assets/i18n-ru-badge.svg

@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="129" height="20">
+    <linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+    <stop offset="1" stop-opacity=".1"/></linearGradient>
+    <mask id="round">
+        <rect width="129" height="20" rx="3" fill="#fff"/>
+    </mask>
+    <g mask="url(#round)">
+        <rect width="75" height="20" fill="#555"/>
+        <rect x="75" width="64" height="20" fill="#4c1"/>
+        <rect width="129" height="20" fill="url(#smooth)"/>
+    </g>
+    <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
+        <text x="37" y="15" fill="#010101" fill-opacity=".3">ru translate</text>
+        <text x="37" y="14">ru translate</text>
+        <text x="100" y="15" fill="#010101" fill-opacity=".3">97.00%</text>
+        <text x="100" y="14">97.00%</text>
+    </g>
+</svg>

build.go

@@ -23,14 +23,17 @@ import (
 	"log/slog"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/osutils"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
 )
@@ -46,6 +49,11 @@ func BuildCmd() *cli.Command {
 				Value:   "alr.sh",
 				Usage:   gotext.Get("Path to the build script"),
 			},
+			&cli.StringFlag{
+				Name:    "subpackage",
+				Aliases: []string{"sb"},
+				Usage:   gotext.Get("Specify subpackage in script (for multi package script only)"),
+			},
 			&cli.StringFlag{
 				Name:    "package",
 				Aliases: []string{"p"},
@@ -59,30 +67,65 @@ func BuildCmd() *cli.Command {
 		},
 		Action: func(c *cli.Context) error {
 			ctx := c.Context
+			cfg := config.New()
+			err := cfg.Load()
+			if err != nil {
+				slog.Error(gotext.Get("Error loading config"), "err", err)
+				os.Exit(1)
+			}
+
+			db := database.New(cfg)
+			rs := repos.New(cfg, db)
+			err = db.Init(ctx)
+			if err != nil {
+				slog.Error(gotext.Get("Error initialization database"), "err", err)
+				os.Exit(1)
+			}
 
 			var script string
+			var packages []string
+			repository := "default"
 
-			// Проверяем, установлен ли флаг script (-s)
+			repoDir := cfg.GetPaths().RepoDir
 
 			switch {
 			case c.IsSet("script"):
 				script = c.String("script")
+				packages = append(packages, c.String("script-package"))
 			case c.IsSet("package"):
+				// TODO: handle multiple packages
 				packageInput := c.String("package")
-				if filepath.Dir(packageInput) == "." {
-					// Не указана директория репозитория, используем 'default' как префикс
-					script = filepath.Join(config.GetPaths(ctx).RepoDir, "default", packageInput, "alr.sh")
+
+				arr := strings.Split(packageInput, "/")
+				var packageSearch string
+				if len(arr) == 2 {
+					packageSearch = arr[1]
 				} else {
-					// Используем путь с указанным репозиторием
-					script = filepath.Join(config.GetPaths(ctx).RepoDir, packageInput, "alr.sh")
+					packageSearch = arr[0]
+				}
+
+				pkgs, _, _ := rs.FindPkgs(ctx, []string{packageSearch})
+				pkg, ok := pkgs[packageSearch]
+				if len(pkg) < 1 || !ok {
+					slog.Error(gotext.Get("Package not found"))
+					os.Exit(1)
+				}
+
+				repository = pkg[0].Repository
+
+				if pkg[0].BasePkgName != "" {
+					script = filepath.Join(repoDir, repository, pkg[0].BasePkgName, "alr.sh")
+					packages = append(packages, pkg[0].Name)
+				} else {
+					script = filepath.Join(repoDir, repository, pkg[0].Name, "alr.sh")
 				}
 			default:
-				script = filepath.Join(config.GetPaths(ctx).RepoDir, "alr.sh")
+				script = filepath.Join(repoDir, "alr.sh")
 			}
 
 			// Проверка автоматического пулла репозиториев
-			if config.GetInstance(ctx).AutoPull(ctx) {
-				err := repos.Pull(ctx, config.Config(ctx).Repos)
+			if cfg.AutoPull() {
+				err := rs.Pull(ctx, cfg.Repos())
 				if err != nil {
 					slog.Error(gotext.Get("Error pulling repositories"), "err", err)
 					os.Exit(1)
@@ -96,13 +139,29 @@ func BuildCmd() *cli.Command {
 				os.Exit(1)
 			}
 
-			// Сборка пакета
-			pkgPaths, _, err := build.BuildPackage(ctx, types.BuildOpts{
+			info, err := distro.ParseOSRelease(ctx)
+			if err != nil {
+				slog.Error(gotext.Get("Error parsing os release"), "err", err)
+				os.Exit(1)
+			}
+
+			builder := build.NewBuilder(
+				ctx,
+				types.BuildOpts{
+					Packages:    packages,
+					Repository:  repository,
 					Script:      script,
 					Manager:     mgr,
 					Clean:       c.Bool("clean"),
 					Interactive: c.Bool("interactive"),
-			})
+				},
+				rs,
+				info,
+				cfg,
+			)
+
+			// Сборка пакета
+			pkgPaths, _, err := builder.BuildPackage(ctx)
 			if err != nil {
 				slog.Error(gotext.Get("Error building package"), "err", err)
 				os.Exit(1)

e2e-tests/addrepo_test.go

@@ -0,0 +1,70 @@
+// 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/>.
+
+//go:build e2e
+
+package e2etests_test
+
+import (
+	"bytes"
+	"testing"
+
+	"github.com/efficientgo/e2e"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestE2EAlrAddRepo(t *testing.T) {
+	dockerMultipleRun(
+		t,
+		"add-repo-remove-repo",
+		COMMON_SYSTEMS,
+		func(t *testing.T, r e2e.Runnable) {
+			err := r.Exec(e2e.NewCommand(
+				"alr",
+				"addrepo",
+				"--name",
+				"alr-repo",
+				"--url",
+				"https://gitea.plemya-x.ru/Plemya-x/alr-repo.git",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"bash",
+				"-c",
+				"cat $HOME/.config/alr/alr.toml",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"alr",
+				"removerepo",
+				"--name",
+				"alr-repo",
+			))
+			assert.NoError(t, err)
+
+			var buf bytes.Buffer
+			err = r.Exec(e2e.NewCommand(
+				"bash",
+				"-c",
+				"cat $HOME/.config/alr/alr.toml",
+			), e2e.WithExecOptionStdout(&buf))
+			assert.NoError(t, err)
+			assert.Contains(t, buf.String(), "rootCmd")
+		},
+	)
+}

e2e-tests/bash_completion_test.go

@@ -0,0 +1,40 @@
+// 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/>.
+
+//go:build e2e
+
+package e2etests_test
+
+import (
+	"testing"
+
+	"github.com/alecthomas/assert/v2"
+	"github.com/efficientgo/e2e"
+)
+
+func TestE2EBashCompletion(t *testing.T) {
+	dockerMultipleRun(
+		t,
+		"bash-completion",
+		COMMON_SYSTEMS,
+		func(t *testing.T, r e2e.Runnable) {
+			err := r.Exec(e2e.NewCommand(
+				"alr", "install", "--generate-bash-completion",
+			))
+			assert.NoError(t, err)
+		},
+	)
+}

e2e-tests/common_test.go

@@ -0,0 +1,180 @@
+// 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/>.
+
+//go:build e2e
+
+package e2etests_test
+
+import (
+	"crypto/sha256"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"log"
+	"os"
+	"os/exec"
+	"testing"
+	"time"
+
+	"github.com/efficientgo/e2e"
+	"github.com/stretchr/testify/assert"
+
+	expect "github.com/tailscale/goexpect"
+)
+
+// DebugWriter оборачивает io.Writer и логирует все записываемые данные.
+type DebugWriter struct {
+	prefix string
+	writer io.Writer
+}
+
+func (d *DebugWriter) Write(p []byte) (n int, err error) {
+	log.Printf("%s: Writing data: %q", d.prefix, p) // Логируем данные
+	return d.writer.Write(p)
+}
+
+// DebugReader оборачивает io.Reader и логирует все читаемые данные.
+type DebugReader struct {
+	prefix string
+	reader io.Reader
+}
+
+func (d *DebugReader) Read(p []byte) (n int, err error) {
+	n, err = d.reader.Read(p)
+	if n > 0 {
+		log.Printf("%s: Read data: %q", d.prefix, p[:n]) // Логируем данные
+	}
+	return n, err
+}
+
+func e2eSpawn(runnable e2e.Runnable, command e2e.Command, timeout time.Duration, opts ...expect.Option) (expect.Expecter, <-chan error, error, *io.PipeWriter) {
+	resCh := make(chan error)
+
+	// Создаем pipe для stdin и stdout
+	stdinReader, stdinWriter := io.Pipe()
+	stdoutReader, stdoutWriter := io.Pipe()
+
+	debugStdinReader := &DebugReader{prefix: "STDIN", reader: stdinReader}
+	debugStdoutWriter := &DebugWriter{prefix: "STDOUT", writer: stdoutWriter}
+
+	go func() {
+		err := runnable.Exec(
+			command,
+			e2e.WithExecOptionStdout(debugStdoutWriter),
+			e2e.WithExecOptionStdin(debugStdinReader),
+			e2e.WithExecOptionStderr(debugStdoutWriter),
+		)
+
+		resCh <- err
+	}()
+
+	exp, chnErr, err := expect.SpawnGeneric(&expect.GenOptions{
+		In:  stdinWriter,
+		Out: stdoutReader,
+		Wait: func() error {
+			return <-resCh
+		},
+		Close: func() error {
+			stdinWriter.Close()
+			stdoutReader.Close()
+			return nil
+		},
+		Check: func() bool { return true },
+	}, timeout, expect.Verbose(true), expect.VerboseWriter(os.Stdout))
+
+	return exp, chnErr, err, stdinWriter
+}
+
+var ALL_SYSTEMS []string = []string{
+	"ubuntu-24.04",
+	// "alt-sisyphus",
+	// "archlinux",
+	// "alpine",
+	// "opensuse-leap",
+	// "redos-8",
+}
+
+var COMMON_SYSTEMS []string = []string{
+	"ubuntu-24.04",
+}
+
+func init() {
+	for _, id := range ALL_SYSTEMS {
+		buildAlrTestImage(id)
+	}
+}
+
+func buildAlrTestImage(id string) {
+	cmd := exec.Command(
+		"docker",
+		"build",
+		"-t", fmt.Sprintf("alr-testimage-%s", id),
+		"-f", fmt.Sprintf("images/Dockerfile.%s", id),
+		".",
+	)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	err := cmd.Run()
+	if err != nil {
+		fmt.Println("Error:", err)
+		return
+	}
+}
+
+func dockerMultipleRun(t *testing.T, name string, ids []string, f func(t *testing.T, runnable e2e.Runnable)) {
+	t.Run(name, func(t *testing.T) {
+		for _, id := range ids {
+			t.Run(id, func(t *testing.T) {
+				t.Parallel()
+				dockerName := fmt.Sprintf("alr-test-%s-%s", name, id)
+				hash := sha256.New()
+				hash.Write([]byte(dockerName))
+				hashSum := hash.Sum(nil)
+				hashString := hex.EncodeToString(hashSum)
+				truncatedHash := hashString[:8]
+				e, err := e2e.New(e2e.WithVerbose(), e2e.WithName(fmt.Sprintf("alr-%s", truncatedHash)))
+				assert.NoError(t, err)
+				t.Cleanup(e.Close)
+				imageId := fmt.Sprintf("alr-testimage-%s", id)
+				runnable := e.Runnable(dockerName).Init(
+					e2e.StartOptions{
+						Image: imageId,
+						Volumes: []string{
+							"./alr:/usr/bin/alr",
+						},
+						Privileged: true,
+					},
+				)
+				assert.NoError(t, e2e.StartAndWaitReady(runnable))
+				f(t, runnable)
+			})
+		}
+	})
+}
+
+func runTestCommands(t *testing.T, r e2e.Runnable, timeout time.Duration, expects []expect.Batcher) {
+	exp, _, err, _ := e2eSpawn(
+		r,
+		e2e.NewCommand("/bin/bash"), 25*time.Second,
+		expect.Verbose(true),
+	)
+	assert.NoError(t, err)
+	_, err = exp.ExpectBatch(
+		expects,
+		timeout,
+	)
+	assert.NoError(t, err)
+}

e2e-tests/fix_test.go

@@ -0,0 +1,43 @@
+// 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/>.
+
+//go:build e2e
+
+package e2etests_test
+
+import (
+	"testing"
+	"time"
+
+	"github.com/efficientgo/e2e"
+	expect "github.com/tailscale/goexpect"
+)
+
+func TestE2EAlrFix(t *testing.T) {
+	dockerMultipleRun(
+		t,
+		"run-fix",
+		COMMON_SYSTEMS,
+		func(t *testing.T, r e2e.Runnable) {
+			runTestCommands(t, r, time.Second*30, []expect.Batcher{
+				&expect.BSnd{S: "alr fix\n"},
+				&expect.BExp{R: `--> Done`},
+				&expect.BSnd{S: "echo $?\n"},
+				&expect.BExp{R: `^0\n$`},
+			})
+		},
+	)
+}

e2e-tests/images/Dockerfile.alpine

@@ -0,0 +1,4 @@
+FROM alpine:latest
+RUN adduser -s /bin/bash alr-user
+USER alr-user
+ENTRYPOINT ["tail", "-f", "/dev/null"]

e2e-tests/images/Dockerfile.alt-sisyphus

@@ -0,0 +1,5 @@
+FROM registry.altlinux.org/sisyphus/alt:latest
+RUN apt-get update && apt-get install -y ca-certificates
+RUN useradd -m -s /bin/bash alr-user
+USER alr-user
+ENTRYPOINT ["tail", "-f", "/dev/null"]

e2e-tests/images/Dockerfile.archlinux

@@ -0,0 +1,4 @@
+FROM archlinux:latest
+RUN useradd -m -s /bin/bash alr-user
+USER alr-user
+ENTRYPOINT ["tail", "-f", "/dev/null"]

e2e-tests/images/Dockerfile.opensuse-leap

@@ -0,0 +1,4 @@
+FROM opensuse/leap:latest
+RUN useradd -m -s /bin/bash alr-user
+USER alr-user
+ENTRYPOINT ["tail", "-f", "/dev/null"]

e2e-tests/images/Dockerfile.redos-8

@@ -0,0 +1,4 @@
+FROM registry.red-soft.ru/ubi8/ubi:latest
+RUN useradd -m -s /bin/bash alr-user
+USER alr-user
+ENTRYPOINT ["tail", "-f", "/dev/null"]

e2e-tests/images/Dockerfile.ubuntu-24.04

@@ -0,0 +1,7 @@
+FROM ubuntu:24.10
+RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates sudo
+RUN useradd -m -s /bin/bash alr-user && \
+    echo "alr-user ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/alr-user && \
+    chmod 0440 /etc/sudoers.d/alr-user
+USER alr-user
+ENTRYPOINT ["tail", "-f", "/dev/null"]

e2e-tests/issue_32_interactive_test.go

@@ -0,0 +1,40 @@
+// 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/>.
+
+//go:build e2e
+
+package e2etests_test
+
+import (
+	"testing"
+
+	"github.com/alecthomas/assert/v2"
+	"github.com/efficientgo/e2e"
+)
+
+func TestE2EIssue32Interactive(t *testing.T) {
+	dockerMultipleRun(
+		t,
+		"issue-32-interactive",
+		COMMON_SYSTEMS,
+		func(t *testing.T, r e2e.Runnable) {
+			err := r.Exec(e2e.NewCommand(
+				"alr", "--interactive=false", "remove", "ca-certificates",
+			))
+			assert.NoError(t, err)
+		},
+	)
+}

e2e-tests/issue_50_install_multiple_test.go

@@ -0,0 +1,55 @@
+// 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/>.
+
+//go:build e2e
+
+package e2etests_test
+
+import (
+	"testing"
+
+	"github.com/alecthomas/assert/v2"
+	"github.com/efficientgo/e2e"
+)
+
+func TestE2EIssue50InstallMultiple(t *testing.T) {
+	dockerMultipleRun(
+		t,
+		"issue-50-install-multiple",
+		COMMON_SYSTEMS,
+		func(t *testing.T, r e2e.Runnable) {
+			err := r.Exec(e2e.NewCommand(
+				"alr",
+				"addrepo",
+				"--name",
+				"alr-repo",
+				"--url",
+				"https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"alr", "in", "foo-pkg", "bar-pkg",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand("cat", "/opt/foo"))
+			assert.NoError(t, err)
+			err = r.Exec(e2e.NewCommand("cat", "/opt/bar"))
+			assert.NoError(t, err)
+		},
+	)
+}

e2e-tests/issue_53_lc_all_c_info_test.go

@@ -14,39 +14,39 @@
 // 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 config
+//go:build e2e
+
+package e2etests_test
 
 import (
-	"context"
-	"sync"
+	"testing"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
+	"github.com/alecthomas/assert/v2"
+	"github.com/efficientgo/e2e"
 )
 
-// Config returns a ALR configuration struct.
-// The first time it's called, it'll load the config from a file.
-// Subsequent calls will just return the same value.
-//
-// Deprecated: use struct method
-func Config(ctx context.Context) *types.Config {
-	return GetInstance(ctx).cfg
-}
-
-// =======================
-// FOR LEGACY ONLY
-// =======================
-
-var (
-	alrConfig     *ALRConfig
-	alrConfigOnce sync.Once
-)
-
-// Deprecated: For legacy only
-func GetInstance(ctx context.Context) *ALRConfig {
-	alrConfigOnce.Do(func() {
-		alrConfig = New()
-		alrConfig.Load(ctx)
-	})
-
-	return alrConfig
+func TestE2EIssue53LcAllCInfo(t *testing.T) {
+	dockerMultipleRun(
+		t,
+		"issue-53-lc-all-c-info",
+		COMMON_SYSTEMS,
+		func(t *testing.T, r e2e.Runnable) {
+			err := r.Exec(e2e.NewCommand(
+				"alr",
+				"addrepo",
+				"--name",
+				"alr-repo",
+				"--url",
+				"https://gitea.plemya-x.ru/Plemya-x/alr-repo.git",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"bash",
+				"-c",
+				"LANG=C alr info alr-bin",
+			))
+			assert.NoError(t, err)
+		},
+	)
 }

e2e-tests/version_test.go

@@ -0,0 +1,44 @@
+// 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/>.
+
+//go:build e2e
+
+package e2etests_test
+
+import (
+	"testing"
+	"time"
+
+	"github.com/efficientgo/e2e"
+
+	expect "github.com/tailscale/goexpect"
+)
+
+func TestE2EAlrVersion(t *testing.T) {
+	dockerMultipleRun(
+		t,
+		"check-version",
+		COMMON_SYSTEMS,
+		func(t *testing.T, r e2e.Runnable) {
+			runTestCommands(t, r, time.Second*10, []expect.Batcher{
+				&expect.BSnd{S: "alr version\n"},
+				&expect.BExp{R: `^v\d+\.\d+\.\d+(?:-\d+-g[a-f0-9]+)?\n$`},
+				&expect.BSnd{S: "echo $?\n"},
+				&expect.BExp{R: `^0\n$`},
+			})
+		},
+	)
+}

fix.go

@@ -27,7 +27,7 @@ import (
 	"github.com/urfave/cli/v2"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
 )
 
@@ -37,13 +37,18 @@ func FixCmd() *cli.Command {
 		Usage: gotext.Get("Attempt to fix problems with ALR"),
 		Action: func(c *cli.Context) error {
 			ctx := c.Context
+			cfg := config.New()
+			err := cfg.Load()
+			if err != nil {
+				slog.Error(gotext.Get("Error loading config"), "err", err)
+				os.Exit(1)
+			}
 
-			db.Close()
-			paths := config.GetPaths(ctx)
+			paths := cfg.GetPaths()
 
 			slog.Info(gotext.Get("Removing cache directory"))
 
-			err := os.RemoveAll(paths.CacheDir)
+			err = os.RemoveAll(paths.CacheDir)
 			if err != nil {
 				slog.Error(gotext.Get("Unable to remove cache directory"), "err", err)
 				os.Exit(1)
@@ -57,7 +62,21 @@ func FixCmd() *cli.Command {
 				os.Exit(1)
 			}
 
-			err = repos.Pull(ctx, config.Config(ctx).Repos)
+			cfg = config.New()
+			err = cfg.Load()
+			if err != nil {
+				slog.Error(gotext.Get("Error loading config"), "err", err)
+				os.Exit(1)
+			}
+
+			db := database.New(cfg)
+			err = db.Init(ctx)
+			if err != nil {
+				slog.Error(gotext.Get("Error initialization database"), "err", err)
+				os.Exit(1)
+			}
+			rs := repos.New(cfg, db)
+			err = rs.Pull(ctx, cfg.Repos())
 			if err != nil {
 				slog.Error(gotext.Get("Error pulling repos"), "err", err)
 				os.Exit(1)

go.mod

@@ -8,11 +8,14 @@ require (
 	gitea.plemya-x.ru/Plemya-x/fakeroot v0.0.1
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/PuerkitoBio/purell v1.2.0
+	github.com/alecthomas/assert/v2 v2.2.1
 	github.com/alecthomas/chroma/v2 v2.9.1
+	github.com/caarlos0/env v3.5.0+incompatible
 	github.com/charmbracelet/bubbles v0.20.0
 	github.com/charmbracelet/bubbletea v1.2.4
 	github.com/charmbracelet/lipgloss v1.0.0
 	github.com/charmbracelet/log v0.4.0
+	github.com/efficientgo/e2e v0.14.1-0.20240418111536-97db25a0c6c0
 	github.com/go-git/go-billy/v5 v5.5.0
 	github.com/go-git/go-git/v5 v5.12.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
@@ -26,6 +29,7 @@ require (
 	github.com/muesli/reflow v0.3.0
 	github.com/pelletier/go-toml/v2 v2.1.0
 	github.com/stretchr/testify v1.10.0
+	github.com/tailscale/goexpect v0.0.0-20210902213824-6e8c725cea41
 	github.com/urfave/cli/v2 v2.25.7
 	github.com/vmihailenco/msgpack/v5 v5.3.5
 	go.elara.ws/vercmp v0.0.0-20230622214216-0b2b067575c4
@@ -46,6 +50,7 @@ require (
 	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/ProtonMail/go-crypto v1.0.0 // indirect
+	github.com/alecthomas/repr v0.2.0 // indirect
 	github.com/andybalholm/brotli v1.0.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb // indirect
@@ -64,6 +69,7 @@ require (
 	github.com/dlclark/regexp2 v1.10.0 // indirect
 	github.com/dsnet/compress v0.0.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/efficientgo/core v1.0.0-rc.0 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
@@ -71,12 +77,14 @@ require (
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f // indirect
 	github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a // indirect
 	github.com/google/uuid v1.4.0 // indirect
 	github.com/goreleaser/chglog v0.6.1 // indirect
 	github.com/goreleaser/fileglob v1.3.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hexops/gotextdiff v1.0.3 // indirect
 	github.com/huandu/xstrings v1.3.3 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect

go.sum

@@ -61,6 +61,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb h1:m935MPodAbYS46DG4pJSv7WO+VECIWUQ7OJYSoTrMh4=
 github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI=
 github.com/bodgit/plumbing v1.2.0 h1:gg4haxoKphLjml+tgnecR4yLBV5zo4HAZGCtAh3xCzM=
@@ -70,11 +72,15 @@ github.com/bodgit/sevenzip v1.3.0/go.mod h1:omwNcgZTEooWM8gA/IJ2Nk/+ZQ94+GsytRzO
 github.com/bodgit/windows v1.0.0 h1:rLQ/XjsleZvx4fR1tB/UxQrK+SJ2OFHzfPjLWWOhDIA=
 github.com/bodgit/windows v1.0.0/go.mod h1:a6JLwrB4KrTR5hBpp8FI9/9W9jJfeQ2h4XDXU74ZCdM=
 github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
+github.com/caarlos0/env v3.5.0+incompatible h1:Yy0UN8o9Wtr/jGHZDpCBLpNrzcFLLM2yixi/rBrKyJs=
+github.com/caarlos0/env v3.5.0+incompatible/go.mod h1:tdCsowwCzMLdkqRYDlHpZCp2UooDD3MspDBjZ2AD02Y=
 github.com/caarlos0/testfs v0.4.4 h1:3PHvzHi5Lt+g332CiShwS8ogTgS3HjrmzZxCm6JCDr8=
 github.com/caarlos0/testfs v0.4.4/go.mod h1:bRN55zgG4XCUVVHZCeU+/Tz1Q6AxEJOEJTliBy+1DMk=
 github.com/cavaliergopher/cpio v1.0.1 h1:KQFSeKmZhv0cr+kawA3a0xTQCU4QxXF1vhU7P7av2KM=
 github.com/cavaliergopher/cpio v1.0.1/go.mod h1:pBdaqQjnvXxdS/6CvNDwIANIFSP0xRKI16PX4xejRQc=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/charmbracelet/bubbles v0.20.0 h1:jSZu6qD8cRQ6k9OMfR1WlM+ruM8fkPWkHvQWD9LIutE=
 github.com/charmbracelet/bubbles v0.20.0/go.mod h1:39slydyswPy+uVOHZ5x/GjwVAFkCsV8IIVy+4MhzwwU=
 github.com/charmbracelet/bubbletea v1.2.4 h1:KN8aCViA0eps9SCOThb2/XPIlea3ANJLUkv3KnQRNCE=
@@ -115,6 +121,10 @@ github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5Jflh
 github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/efficientgo/core v1.0.0-rc.0 h1:jJoA0N+C4/knWYVZ6GrdHOtDyrg8Y/TR4vFpTaqTsqs=
+github.com/efficientgo/core v1.0.0-rc.0/go.mod h1:kQa0V74HNYMfuJH6jiPiwNdpWXl4xd/K4tzlrcvYDQI=
+github.com/efficientgo/e2e v0.14.1-0.20240418111536-97db25a0c6c0 h1:C/FNIs+MtAJgQYLJ9FX/ACFYyDRuLYoXTmueErrOJyA=
+github.com/efficientgo/e2e v0.14.1-0.20240418111536-97db25a0c6c0/go.mod h1:plsKU0YHE9uX+7utvr7SiDtVBSHJyEfHRO4UnUgDmts=
 github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU=
 github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
@@ -161,6 +171,8 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -171,6 +183,8 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f h1:5CjVwnuUcp5adK4gmY6i72gpVFVnZDP2h5TmPScB6u4=
+github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod h1:nOFQdrUlIlx6M6ODdSpBj1NVA+VgLC6kmw60mkw34H4=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -217,6 +231,8 @@ github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 h1:wMeVzrPO3m
 github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o=
 github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
 github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
+github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
@@ -262,6 +278,8 @@ github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
 github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/mholt/archiver/v4 v4.0.0-alpha.8 h1:tRGQuDVPh66WCOelqe6LIGh0gwmfwxUrSSDunscGsRM=
@@ -282,6 +300,8 @@ github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
 github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
 github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
 github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nwaples/rardecode/v2 v2.0.0-beta.2 h1:e3mzJFJs4k83GXBEiTaQ5HgSc/kOK8q0rDaRO0MPaOk=
 github.com/nwaples/rardecode/v2 v2.0.0-beta.2/go.mod h1:yntwv/HfMc/Hbvtq9I19D1n58te3h6KsqCf3GxyfBGY=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
@@ -296,7 +316,15 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk=
+github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.36.0 h1:78hJTing+BLYLjhXE+Z2BubeEymH5Lr0/Mt8FKkxxYo=
+github.com/prometheus/common v0.36.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
+github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
+github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
@@ -338,6 +366,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/tailscale/goexpect v0.0.0-20210902213824-6e8c725cea41 h1:/V2rCMMWcsjYaYO2MeovLw+ClP63OtXgCF2Y1eb8+Ns=
+github.com/tailscale/goexpect v0.0.0-20210902213824-6e8c725cea41/go.mod h1:/roCdA6gg6lQyw/Oz6gIIGu3ggJKYhF+WC/AQReE5XQ=
 github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw=
 github.com/therootcompany/xz v1.0.1/go.mod h1:3K3UH1yCKgBneZYhuQUvJ9HPD19UEXEI0BWbMn8qNMY=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
@@ -435,6 +465,8 @@ golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4Iltr
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg=
+golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -540,6 +572,8 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -560,6 +594,8 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -570,6 +606,7 @@ gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

info.go

@@ -24,13 +24,14 @@ import (
 	"log/slog"
 	"os"
 
+	"github.com/jeandeaual/go-locale"
 	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
 	"gopkg.in/yaml.v3"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
@@ -47,12 +48,52 @@ func InfoCmd() *cli.Command {
 				Usage:   gotext.Get("Show all information, not just for the current distro"),
 			},
 		},
+		BashComplete: func(c *cli.Context) {
+			ctx := c.Context
+			cfg := config.New()
+			err := cfg.Load()
+			if err != nil {
+				slog.Error(gotext.Get("Error loading config"), "err", err)
+				os.Exit(1)
+			}
+
+			db := database.New(cfg)
+			err = db.Init(ctx)
+			if err != nil {
+				slog.Error(gotext.Get("Error initialization database"), "err", err)
+				os.Exit(1)
+			}
+
+			result, err := db.GetPkgs(c.Context, "true")
+			if err != nil {
+				slog.Error(gotext.Get("Error getting packages"), "err", err)
+				os.Exit(1)
+			}
+			defer result.Close()
+
+			for result.Next() {
+				var pkg database.Package
+				err = result.StructScan(&pkg)
+				if err != nil {
+					slog.Error(gotext.Get("Error iterating over packages"), "err", err)
+					os.Exit(1)
+				}
+
+				fmt.Println(pkg.Name)
+			}
+		},
 		Action: func(c *cli.Context) error {
 			ctx := c.Context
 
 			cfg := config.New()
-			db := db.New(cfg)
-			err := db.Init(ctx)
+			err := cfg.Load()
+			if err != nil {
+				slog.Error(gotext.Get("Error loading config"), "err", err)
+				os.Exit(1)
+			}
+
+			db := database.New(cfg)
+			err = db.Init(ctx)
 			if err != nil {
 				slog.Error(gotext.Get("Error initialization database"), "err", err)
 				os.Exit(1)
@@ -65,8 +106,8 @@ func InfoCmd() *cli.Command {
 				os.Exit(1)
 			}
 
-			if cfg.AutoPull(ctx) {
-				err := rs.Pull(ctx, cfg.Repos(ctx))
+			if cfg.AutoPull() {
+				err := rs.Pull(ctx, cfg.Repos())
 				if err != nil {
 					slog.Error(gotext.Get("Error pulling repos"), "err", err)
 					os.Exit(1)
@@ -88,6 +129,15 @@ func InfoCmd() *cli.Command {
 			var names []string
 			all := c.Bool("all")
 
+			systemLang, err := locale.GetLanguage()
+			if err != nil {
+				slog.Error("Can't detect system language", "err", err)
+				os.Exit(1)
+			}
+			if systemLang == "" {
+				systemLang = "en"
+			}
+
 			if !all {
 				info, err := distro.ParseOSRelease(ctx)
 				if err != nil {
@@ -97,7 +147,7 @@ func InfoCmd() *cli.Command {
 				names, err = overrides.Resolve(
 					info,
 					overrides.DefaultOpts.
-						WithLanguages([]string{config.SystemLang()}),
+						WithLanguages([]string{systemLang}),
 				)
 				if err != nil {
 					slog.Error(gotext.Get("Error resolving overrides"), "err", err)

install.go

@@ -29,9 +29,10 @@ import (
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	database "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/build"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
 )
@@ -45,7 +46,7 @@ func InstallCmd() *cli.Command {
 			&cli.BoolFlag{
 				Name:    "clean",
 				Aliases: []string{"c"},
-				Usage:   "Build package from scratch even if there's an already built package available",
+				Usage:   gotext.Get("Build package from scratch even if there's an already built package available"),
 			},
 		},
 		Action: func(c *cli.Context) error {
@@ -63,22 +64,58 @@ func InstallCmd() *cli.Command {
 				os.Exit(1)
 			}
 
-			if config.GetInstance(ctx).AutoPull(ctx) {
-				err := repos.Pull(ctx, config.Config(ctx).Repos)
+			cfg := config.New()
+			err := cfg.Load()
+			if err != nil {
+				slog.Error(gotext.Get("Error loading config"), "err", err)
+				os.Exit(1)
+			}
+
+			db := database.New(cfg)
+			rs := repos.New(cfg, db)
+			err = db.Init(ctx)
+			if err != nil {
+				slog.Error(gotext.Get("Error initialization database"), "err", err)
+				os.Exit(1)
+			}
+
+			if cfg.AutoPull() {
+				err := rs.Pull(ctx, cfg.Repos())
 				if err != nil {
 					slog.Error(gotext.Get("Error pulling repositories"), "err", err)
 					os.Exit(1)
 				}
 			}
 
-			found, notFound, err := repos.FindPkgs(ctx, args.Slice())
+			found, notFound, err := rs.FindPkgs(ctx, args.Slice())
 			if err != nil {
 				slog.Error(gotext.Get("Error finding packages"), "err", err)
 				os.Exit(1)
 			}
 
 			pkgs := cliutils.FlattenPkgs(ctx, found, "install", c.Bool("interactive"))
-			build.InstallPkgs(ctx, pkgs, notFound, types.BuildOpts{
+
+			opts := types.BuildOpts{
+				Manager:     mgr,
+				Clean:       c.Bool("clean"),
+				Interactive: c.Bool("interactive"),
+			}
+
+			info, err := distro.ParseOSRelease(ctx)
+			if err != nil {
+				slog.Error(gotext.Get("Error parsing os release"), "err", err)
+				os.Exit(1)
+			}
+
+			builder := build.NewBuilder(
+				ctx,
+				opts,
+				rs,
+				info,
+				cfg,
+			)
+
+			builder.InstallPkgs(ctx, pkgs, notFound, types.BuildOpts{
 				Manager:     mgr,
 				Clean:       c.Bool("clean"),
 				Interactive: c.Bool("interactive"),
@@ -86,6 +123,19 @@ func InstallCmd() *cli.Command {
 			return nil
 		},
 		BashComplete: func(c *cli.Context) {
+			cfg := config.New()
+			err := cfg.Load()
+			if err != nil {
+				slog.Error(gotext.Get("Error loading config"), "err", err)
+				os.Exit(1)
+			}
+
+			db := database.New(cfg)
+			err = db.Init(c.Context)
+			if err != nil {
+				slog.Error(gotext.Get("Error initialization database"), "err", err)
+				os.Exit(1)
+			}
 			result, err := db.GetPkgs(c.Context, "true")
 			if err != nil {
 				slog.Error(gotext.Get("Error getting packages"), "err", err)
@@ -94,7 +144,7 @@ func InstallCmd() *cli.Command {
 			defer result.Close()
 
 			for result.Next() {
-				var pkg db.Package
+				var pkg database.Package
 				err = result.StructScan(&pkg)
 				if err != nil {
 					slog.Error(gotext.Get("Error iterating over packages"), "err", err)
@@ -125,7 +175,10 @@ func RemoveCmd() *cli.Command {
 				os.Exit(1)
 			}
 
-			err := mgr.Remove(nil, c.Args().Slice()...)
+			err := mgr.Remove(&manager.Opts{
+				AsRoot:    true,
+				NoConfirm: !c.Bool("interactive"),
+			}, c.Args().Slice()...)
 			if err != nil {
 				slog.Error(gotext.Get("Error removing packages"), "err", err)
 				os.Exit(1)

internal/cliutils/template.go

@@ -0,0 +1,102 @@
+// 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 cliutils
+
+import (
+	"fmt"
+
+	"github.com/leonelquinteros/gotext"
+)
+
+// Templates are based on https://github.com/urfave/cli/blob/3b17080d70a630feadadd23dd036cad121dd9a50/template.go
+
+//nolint:unused
+var (
+	helpNameTemplate    = `{{$v := offset .HelpName 6}}{{wrap .HelpName 3}}{{if .Usage}} - {{wrap .Usage $v}}{{end}}`
+	descriptionTemplate = `{{wrap .Description 3}}`
+	authorsTemplate     = `{{with $length := len .Authors}}{{if ne 1 $length}}S{{end}}{{end}}:
+   {{range $index, $author := .Authors}}{{if $index}}
+   {{end}}{{$author}}{{end}}`
+	visibleCommandTemplate = `{{ $cv := offsetCommands .VisibleCommands 5}}{{range .VisibleCommands}}
+   {{$s := join .Names ", "}}{{$s}}{{ $sp := subtract $cv (offset $s 3) }}{{ indent $sp ""}}{{wrap .Usage $cv}}{{end}}`
+	visibleCommandCategoryTemplate = `{{range .VisibleCategories}}{{if .Name}}
+   {{.Name}}:{{range .VisibleCommands}}
+     {{join .Names ", "}}{{"\t"}}{{.Usage}}{{end}}{{else}}{{template "visibleCommandTemplate" .}}{{end}}{{end}}`
+	visibleFlagCategoryTemplate = `{{range .VisibleFlagCategories}}
+   {{if .Name}}{{.Name}}
+
+   {{end}}{{$flglen := len .Flags}}{{range $i, $e := .Flags}}{{if eq (subtract $flglen $i) 1}}{{$e}}
+{{else}}{{$e}}
+   {{end}}{{end}}{{end}}`
+	visibleFlagTemplate = `{{range $i, $e := .VisibleFlags}}
+   {{wrap $e.String 6}}{{end}}`
+	copyrightTemplate = `{{wrap .Copyright 3}}`
+)
+
+func GetAppCliTemplate() string {
+	return fmt.Sprintf(`%s:
+	{{template "helpNameTemplate" .}}
+
+%s:
+	{{if .UsageText}}{{wrap .UsageText 3}}{{else}}{{.HelpName}} {{if .VisibleFlags}}[%s]{{end}}{{if .Commands}} %s [%s]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[%s...]{{end}}{{end}}{{if .Version}}{{if not .HideVersion}}
+
+%s:
+	{{.Version}}{{end}}{{end}}{{if .Description}}
+
+%s:
+   {{template "descriptionTemplate" .}}{{end}}
+{{- if len .Authors}}
+
+%s{{template "authorsTemplate" .}}{{end}}{{if .VisibleCommands}}
+
+%s:{{template "visibleCommandCategoryTemplate" .}}{{end}}{{if .VisibleFlagCategories}}
+
+%s:{{template "visibleFlagCategoryTemplate" .}}{{else if .VisibleFlags}}
+
+%s:{{template "visibleFlagTemplate" .}}{{end}}{{if .Copyright}}
+
+%s:
+   {{template "copyrightTemplate" .}}{{end}}
+`, gotext.Get("NAME"), gotext.Get("USAGE"), gotext.Get("global options"), gotext.Get("command"), gotext.Get("command options"), gotext.Get("arguments"), gotext.Get("VERSION"), gotext.Get("DESCRIPTION"), gotext.Get("AUTHOR"), gotext.Get("COMMANDS"), gotext.Get("GLOBAL OPTIONS"), gotext.Get("GLOBAL OPTIONS"), gotext.Get("COPYRIGHT"))
+}
+
+func GetCommandHelpTemplate() string {
+	return fmt.Sprintf(`%s:
+   {{template "helpNameTemplate" .}}
+
+%s:
+   {{if .UsageText}}{{wrap .UsageText 3}}{{else}}{{.HelpName}}{{if .VisibleFlags}} [%s]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[%s...]{{end}}{{end}}{{if .Category}}
+
+%s:
+   {{.Category}}{{end}}{{if .Description}}
+
+%s:
+   {{template "descriptionTemplate" .}}{{end}}{{if .VisibleFlagCategories}}
+
+%s:{{template "visibleFlagCategoryTemplate" .}}{{else if .VisibleFlags}}
+
+%s:{{template "visibleFlagTemplate" .}}{{end}}
+`, gotext.Get("NAME"),
+		gotext.Get("USAGE"),
+		gotext.Get("command options"),
+		gotext.Get("arguments"),
+		gotext.Get("CATEGORY"),
+		gotext.Get("DESCRIPTION"),
+		gotext.Get("OPTIONS"),
+		gotext.Get("OPTIONS"),
+	)
+}

internal/config/config.go

@@ -20,15 +20,14 @@
 package config
 
 import (
-	"context"
 	"log/slog"
 	"os"
 	"path/filepath"
-	"sync"
-
-	"github.com/pelletier/go-toml/v2"
+	"reflect"
 
+	"github.com/caarlos0/env"
 	"github.com/leonelquinteros/gotext"
+	"github.com/pelletier/go-toml/v2"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 )
@@ -36,9 +35,6 @@ import (
 type ALRConfig struct {
 	cfg   *types.Config
 	paths *Paths
-
-	cfgOnce   sync.Once
-	pathsOnce sync.Once
 }
 
 var defaultConfig = &types.Config{
@@ -46,127 +42,159 @@ var defaultConfig = &types.Config{
 	PagerStyle:       "native",
 	IgnorePkgUpdates: []string{},
 	AutoPull:         true,
-	Repos: []types.Repo{
-		{
-			Name: "default",
-			URL:  "https://gitea.plemya-x.ru/xpamych/xpamych-alr-repo.git",
-		},
-	},
+	Repos:            []types.Repo{},
 }
 
 func New() *ALRConfig {
 	return &ALRConfig{}
 }
 
-func (c *ALRConfig) Load(ctx context.Context) {
-	cfgFl, err := os.Open(c.GetPaths(ctx).ConfigPath)
+func readConfig(path string) (*types.Config, error) {
+	file, err := os.Open(path)
 	if err != nil {
-		slog.Warn(gotext.Get("Error opening config file, using defaults"), "err", err)
-		c.cfg = defaultConfig
-		return
+		return nil, err
 	}
-	defer cfgFl.Close()
+	defer file.Close()
 
-	// Copy the default configuration into config
-	defCopy := *defaultConfig
-	config := &defCopy
-	config.Repos = nil
+	config := types.Config{}
 
-	err = toml.NewDecoder(cfgFl).Decode(config)
-	if err != nil {
-		slog.Warn(gotext.Get("Error decoding config file, using defaults"), "err", err)
-		c.cfg = defaultConfig
-		return
+	if err := toml.NewDecoder(file).Decode(&config); err != nil {
+		return nil, err
 	}
-	c.cfg = config
+
+	return &config, nil
 }
 
-func (c *ALRConfig) initPaths() {
-	paths := &Paths{}
+func mergeStructs(dst, src interface{}) {
+	srcVal := reflect.ValueOf(src)
+	if srcVal.IsNil() {
+		return
+	}
+	srcVal = srcVal.Elem()
+	dstVal := reflect.ValueOf(dst).Elem()
+
+	for i := range srcVal.NumField() {
+		srcField := srcVal.Field(i)
+		srcFieldName := srcVal.Type().Field(i).Name
+
+		dstField := dstVal.FieldByName(srcFieldName)
+		if dstField.IsValid() && dstField.CanSet() {
+			dstField.Set(srcField)
+		}
+	}
+}
+
+const systemConfigPath = "/etc/alr/alr.toml"
+
+func (c *ALRConfig) Load() error {
+	systemConfig, err := readConfig(
+		systemConfigPath,
+	)
+	if err != nil {
+		slog.Debug("Cannot read system config", "err", err)
+	}
 
 	cfgDir, err := os.UserConfigDir()
 	if err != nil {
-		slog.Error(gotext.Get("Unable to detect user config directory"), "err", err)
-		os.Exit(1)
+		slog.Debug("Cannot read user config directory")
 	}
+	userConfigPath := filepath.Join(cfgDir, "alr", "alr.toml")
 
-	paths.ConfigDir = filepath.Join(cfgDir, "alr")
-
-	err = os.MkdirAll(paths.ConfigDir, 0o755)
+	userConfig, err := readConfig(
+		userConfigPath,
+	)
 	if err != nil {
-		slog.Error(gotext.Get("Unable to create ALR config directory"), "err", err)
-		os.Exit(1)
+		slog.Debug("Cannot read user config")
 	}
 
-	paths.ConfigPath = filepath.Join(paths.ConfigDir, "alr.toml")
+	config := &types.Config{}
 
-	if _, err := os.Stat(paths.ConfigPath); err != nil {
-		cfgFl, err := os.Create(paths.ConfigPath)
+	mergeStructs(config, defaultConfig)
+	mergeStructs(config, systemConfig)
+	mergeStructs(config, userConfig)
+	err = env.Parse(config)
 	if err != nil {
-			slog.Error(gotext.Get("Unable to create ALR config file"), "err", err)
-			os.Exit(1)
+		return err
 	}
 
-		err = toml.NewEncoder(cfgFl).Encode(&defaultConfig)
-		if err != nil {
-			slog.Error(gotext.Get("Error encoding default configuration"), "err", err)
-			os.Exit(1)
-		}
-
-		cfgFl.Close()
-	}
+	c.cfg = config
 
 	cacheDir, err := os.UserCacheDir()
 	if err != nil {
-		slog.Error(gotext.Get("Unable to detect cache directory"), "err", err)
+		return err
+	}
+	c.paths = &Paths{}
+	c.paths.UserConfigPath = userConfigPath
+	c.paths.CacheDir = filepath.Join(cacheDir, "alr")
+	c.paths.RepoDir = filepath.Join(c.paths.CacheDir, "repo")
+	c.paths.PkgsDir = filepath.Join(c.paths.CacheDir, "pkgs")
+	c.paths.DBPath = filepath.Join(c.paths.CacheDir, "db")
+	c.initPaths()
+
+	return nil
+}
+
+func (c *ALRConfig) RootCmd() string {
+	return c.cfg.RootCmd
+}
+
+func (c *ALRConfig) PagerStyle() string {
+	return c.cfg.PagerStyle
+}
+
+func (c *ALRConfig) AutoPull() bool {
+	return c.cfg.AutoPull
+}
+
+func (c *ALRConfig) AllowRunAsRoot() bool {
+	return c.cfg.Unsafe.AllowRunAsRoot
+}
+
+func (c *ALRConfig) Repos() []types.Repo {
+	return c.cfg.Repos
+}
+
+func (c *ALRConfig) SetRepos(repos []types.Repo) {
+	c.cfg.Repos = repos
+}
+
+func (c *ALRConfig) IgnorePkgUpdates() []string {
+	return c.cfg.IgnorePkgUpdates
+}
+
+func (c *ALRConfig) LogLevel() string {
+	return c.cfg.LogLevel
+}
+
+func (c *ALRConfig) GetPaths() *Paths {
+	return c.paths
+}
+
+func (c *ALRConfig) initPaths() {
+	err := os.MkdirAll(filepath.Dir(c.paths.UserConfigPath), 0o755)
+	if err != nil {
+		slog.Error(gotext.Get("Unable to create config directory"), "err", err)
 		os.Exit(1)
 	}
 
-	paths.CacheDir = filepath.Join(cacheDir, "alr")
-	paths.RepoDir = filepath.Join(paths.CacheDir, "repo")
-	paths.PkgsDir = filepath.Join(paths.CacheDir, "pkgs")
-
-	err = os.MkdirAll(paths.RepoDir, 0o755)
+	err = os.MkdirAll(c.paths.RepoDir, 0o755)
 	if err != nil {
 		slog.Error(gotext.Get("Unable to create repo cache directory"), "err", err)
 		os.Exit(1)
 	}
 
-	err = os.MkdirAll(paths.PkgsDir, 0o755)
+	err = os.MkdirAll(c.paths.PkgsDir, 0o755)
 	if err != nil {
 		slog.Error(gotext.Get("Unable to create package cache directory"), "err", err)
 		os.Exit(1)
 	}
-
-	paths.DBPath = filepath.Join(paths.CacheDir, "db")
-
-	c.paths = paths
 }
 
-func (c *ALRConfig) GetPaths(ctx context.Context) *Paths {
-	c.pathsOnce.Do(func() {
-		c.initPaths()
-	})
-	return c.paths
-}
+func (c *ALRConfig) SaveUserConfig() error {
+	f, err := os.Create(c.paths.UserConfigPath)
+	if err != nil {
+		return err
+	}
 
-func (c *ALRConfig) Repos(ctx context.Context) []types.Repo {
-	c.cfgOnce.Do(func() {
-		c.Load(ctx)
-	})
-	return c.cfg.Repos
-}
-
-func (c *ALRConfig) IgnorePkgUpdates(ctx context.Context) []string {
-	c.cfgOnce.Do(func() {
-		c.Load(ctx)
-	})
-	return c.cfg.IgnorePkgUpdates
-}
-
-func (c *ALRConfig) AutoPull(ctx context.Context) bool {
-	c.cfgOnce.Do(func() {
-		c.Load(ctx)
-	})
-	return c.cfg.AutoPull
+	return toml.NewEncoder(f).Encode(c.cfg)
 }

internal/config/lang.go

@@ -1,70 +0,0 @@
-// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
-// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
-//
-// 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 config
-
-import (
-	"context"
-	"log/slog"
-	"os"
-	"strings"
-	"sync"
-
-	"github.com/leonelquinteros/gotext"
-	"golang.org/x/text/language"
-)
-
-var (
-	langMtx sync.Mutex
-	lang    language.Tag
-	langSet bool
-)
-
-// Language returns the system language.
-// The first time it's called, it'll detect the langauge based on
-// the $LANG environment variable.
-// Subsequent calls will just return the same value.
-func Language(ctx context.Context) language.Tag {
-	langMtx.Lock()
-	if !langSet {
-		syslang := SystemLang()
-		tag, err := language.Parse(syslang)
-		if err != nil {
-			slog.Error(gotext.Get("Error parsing system language"), "err", err)
-			langMtx.Unlock()
-			os.Exit(1)
-		}
-		base, _ := tag.Base()
-		lang = language.Make(base.String())
-		langSet = true
-	}
-	langMtx.Unlock()
-	return lang
-}
-
-// SystemLang returns the system language based on
-// the $LANG environment variable.
-func SystemLang() string {
-	lang := os.Getenv("LANG")
-	lang, _, _ = strings.Cut(lang, ".")
-	if lang == "" || lang == "C" {
-		lang = "en"
-	}
-	return lang
-}

internal/config/paths.go

@@ -19,27 +19,11 @@
 
 package config
 
-import (
-	"context"
-)
-
 // Paths contains various paths used by ALR
 type Paths struct {
-	ConfigDir  string
-	ConfigPath string
+	UserConfigPath string
 	CacheDir       string
 	RepoDir        string
 	PkgsDir        string
 	DBPath         string
 }
-
-// GetPaths returns a Paths struct.
-// The first time it's called, it'll generate the struct
-// using information from the system.
-// Subsequent calls will return the same value.
-//
-// Deprecated: use struct API
-func GetPaths(ctx context.Context) *Paths {
-	alrConfig := GetInstance(ctx)
-	return alrConfig.GetPaths(ctx)
-}

internal/db/db.go

@@ -31,10 +31,11 @@ import (
 
 // CurrentVersion is the current version of the database.
 // The database is reset if its version doesn't match this.
-const CurrentVersion = 2
+const CurrentVersion = 3
 
 // Package is a ALR package's database representation
 type Package struct {
+	BasePkgName   string                    `sh:"base" db:"basepkg_name"`
 	Name          string                    `sh:"name,required" db:"name"`
 	Version       string                    `sh:"version,required" db:"version"`
 	Release       int                       `sh:"release,required" db:"release"`
@@ -58,7 +59,7 @@ type version struct {
 }
 
 type Config interface {
-	GetPaths(ctx context.Context) *config.Paths
+	GetPaths() *config.Paths
 }
 
 type Database struct {
@@ -81,7 +82,7 @@ func (d *Database) Init(ctx context.Context) error {
 }
 
 func (d *Database) Connect(ctx context.Context) error {
-	dsn := d.config.GetPaths(ctx).DBPath
+	dsn := d.config.GetPaths().DBPath
 	db, err := sqlx.Open("sqlite", dsn)
 	if err != nil {
 		return err
@@ -99,6 +100,7 @@ func (d *Database) initDB(ctx context.Context) error {
 	conn := d.conn
 	_, err := conn.ExecContext(ctx, `
 		CREATE TABLE IF NOT EXISTS pkgs (
+			basepkg_name  TEXT NOT NULL,
 			name          TEXT NOT NULL,
 			repository    TEXT NOT NULL,
 			version       TEXT NOT NULL,
@@ -196,6 +198,7 @@ func (d *Database) IsEmpty(ctx context.Context) bool {
 func (d *Database) InsertPackage(ctx context.Context, pkg Package) error {
 	_, err := d.conn.NamedExecContext(ctx, `
 		INSERT OR REPLACE INTO pkgs (
+			basepkg_name,
 			name,
 			repository,
 			version,
@@ -213,6 +216,7 @@ func (d *Database) InsertPackage(ctx context.Context, pkg Package) error {
 			builddepends,
 			optdepends
 		) VALUES (
+		 	:basepkg_name,
 			:name,
 			:repository,
 			:version,

internal/db/db_legacy.go

@@ -1,106 +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 db
-
-import (
-	"context"
-	"log/slog"
-	"os"
-	"sync"
-
-	"github.com/jmoiron/sqlx"
-	"github.com/leonelquinteros/gotext"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-)
-
-// DB returns the ALR database.
-// The first time it's called, it opens the SQLite database file.
-// Subsequent calls return the same connection.
-//
-// Deprecated: use struct method
-func DB(ctx context.Context) *sqlx.DB {
-	return GetInstance(ctx).GetConn()
-}
-
-// Close closes the database
-//
-// Deprecated: use struct method
-func Close() error {
-	if database != nil {
-		return database.Close()
-	}
-	return nil
-}
-
-// IsEmpty returns true if the database has no packages in it, otherwise it returns false.
-//
-// Deprecated: use struct method
-func IsEmpty(ctx context.Context) bool {
-	return GetInstance(ctx).IsEmpty(ctx)
-}
-
-// InsertPackage adds a package to the database
-//
-// Deprecated: use struct method
-func InsertPackage(ctx context.Context, pkg Package) error {
-	return GetInstance(ctx).InsertPackage(ctx, pkg)
-}
-
-// GetPkgs returns a result containing packages that match the where conditions
-//
-// Deprecated: use struct method
-func GetPkgs(ctx context.Context, where string, args ...any) (*sqlx.Rows, error) {
-	return GetInstance(ctx).GetPkgs(ctx, where, args...)
-}
-
-// GetPkg returns a single package that matches the where conditions
-//
-// Deprecated: use struct method
-func GetPkg(ctx context.Context, where string, args ...any) (*Package, error) {
-	return GetInstance(ctx).GetPkg(ctx, where, args...)
-}
-
-// DeletePkgs deletes all packages matching the where conditions
-//
-// Deprecated: use struct method
-func DeletePkgs(ctx context.Context, where string, args ...any) error {
-	return GetInstance(ctx).DeletePkgs(ctx, where, args...)
-}
-
-// =======================
-// FOR LEGACY ONLY
-// =======================
-
-var (
-	dbOnce   sync.Once
-	database *Database
-)
-
-// Deprecated: For legacy only
-func GetInstance(ctx context.Context) *Database {
-	dbOnce.Do(func() {
-		cfg := config.GetInstance(ctx)
-		database = New(cfg)
-		err := database.Init(ctx)
-		if err != nil {
-			slog.Error(gotext.Get("Error opening database"), "err", err)
-			os.Exit(1)
-		}
-	})
-	return database
-}

internal/db/db_test.go

@@ -33,7 +33,7 @@ import (
 
 type TestALRConfig struct{}
 
-func (c *TestALRConfig) GetPaths(ctx context.Context) *config.Paths {
+func (c *TestALRConfig) GetPaths() *config.Paths {
 	return &config.Paths{
 		DBPath: ":memory:",
 	}

internal/dl/dl_test.go

@@ -38,7 +38,7 @@ import (
 
 type TestALRConfig struct{}
 
-func (c *TestALRConfig) GetPaths(ctx context.Context) *config.Paths {
+func (c *TestALRConfig) GetPaths() *config.Paths {
 	return &config.Paths{
 		CacheDir: "/tmp",
 	}
@@ -91,7 +91,7 @@ func TestDownloadWithoutCache(t *testing.T) {
 		},
 		{
 			name: "git download",
-			path: "git+%s/git-downloader/git/Plemya-x/xpamych-alr-repo",
+			path: "git+%s/git-downloader/git/Plemya-x/alr-repo",
 			expected: func(t *testing.T, err error, tmpdir string) {
 				assert.NoError(t, err)
 

internal/dl/file.go

@@ -123,6 +123,7 @@ func (FileDownloader) Download(ctx context.Context, opts Options) (Type, string,
 	} else {
 		out = fl
 	}
+	defer out.Close()
 
 	h, err := opts.NewHash()
 	if err != nil {

internal/dlcache/dlcache.go

@@ -28,7 +28,7 @@ import (
 )
 
 type Config interface {
-	GetPaths(ctx context.Context) *config.Paths
+	GetPaths() *config.Paths
 }
 
 type DownloadCache struct {
@@ -43,7 +43,7 @@ func New(cfg Config) *DownloadCache {
 
 func (dc *DownloadCache) BasePath(ctx context.Context) string {
 	return filepath.Join(
-		dc.cfg.GetPaths(ctx).CacheDir, "dl",
+		dc.cfg.GetPaths().CacheDir, "dl",
 	)
 }
 

internal/dlcache/dlcache_test.go

@@ -32,19 +32,11 @@ import (
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/dlcache"
 )
 
-func init() {
-	dir, err := os.MkdirTemp("/tmp", "alr-dlcache-test.*")
-	if err != nil {
-		panic(err)
-	}
-	config.GetPaths(context.Background()).RepoDir = dir
-}
-
 type TestALRConfig struct {
 	CacheDir string
 }
 
-func (c *TestALRConfig) GetPaths(ctx context.Context) *config.Paths {
+func (c *TestALRConfig) GetPaths() *config.Paths {
 	return &config.Paths{
 		CacheDir: c.CacheDir,
 	}

internal/logger/log.go

@@ -62,6 +62,25 @@ func New() *Logger {
 	}
 }
 
+func slogLevelToLog(level slog.Level) log.Level {
+	switch level {
+	case slog.LevelDebug:
+		return log.DebugLevel
+	case slog.LevelInfo:
+		return log.InfoLevel
+	case slog.LevelWarn:
+		return log.WarnLevel
+	case slog.LevelError:
+		return log.ErrorLevel
+	}
+	return log.FatalLevel
+}
+
+func (l *Logger) SetLevel(level slog.Level) {
+	l.lOut.(*log.Logger).SetLevel(slogLevelToLog(level))
+	l.lErr.(*log.Logger).SetLevel(slogLevelToLog(level))
+}
+
 func (l *Logger) Enabled(ctx context.Context, level slog.Level) bool {
 	if level <= slog.LevelInfo {
 		return l.lOut.Enabled(ctx, level)
@@ -90,7 +109,9 @@ func (l *Logger) WithGroup(name string) slog.Handler {
 	return &sl
 }
 
-func SetupDefault() {
-	logger := slog.New(New())
+func SetupDefault() *Logger {
+	l := New()
+	logger := slog.New(l)
 	slog.SetDefault(logger)
+	return l
 }

internal/pager/pager.go

@@ -41,7 +41,7 @@ func init() {
 
 	b2 := lipgloss.RoundedBorder()
 	b2.Left = "\u2524"
-	infoStyle = titleStyle.Copy().BorderStyle(b2)
+	infoStyle = titleStyle.BorderStyle(b2)
 }
 
 type Pager struct {

internal/shutils/decoder/decoder.go

@@ -164,7 +164,10 @@ func (d *Decoder) DecodeVars(val any) error {
 	return nil
 }
 
-type ScriptFunc func(ctx context.Context, opts ...interp.RunnerOption) error
+type (
+	ScriptFunc             func(ctx context.Context, opts ...interp.RunnerOption) error
+	ScriptFuncWithSubshell func(ctx context.Context, opts ...interp.RunnerOption) (*interp.Runner, error)
+)
 
 // GetFunc returns a function corresponding to a bash function
 // with the given name
@@ -197,6 +200,24 @@ func (d *Decoder) GetFuncP(name string, prepare PrepareFunc) (ScriptFunc, bool)
 	}, true
 }
 
+func (d *Decoder) GetFuncWithSubshell(name string) (ScriptFuncWithSubshell, bool) {
+	fn := d.getFunc(name)
+	if fn == nil {
+		return nil, false
+	}
+
+	return func(ctx context.Context, opts ...interp.RunnerOption) (*interp.Runner, error) {
+		sub := d.Runner.Subshell()
+		for _, opt := range opts {
+			err := opt(sub)
+			if err != nil {
+				return nil, err
+			}
+		}
+		return sub, sub.Run(ctx, fn)
+	}, true
+}
+
 func (d *Decoder) getFunc(name string) *syntax.Stmt {
 	names, err := overrides.Resolve(d.info, overrides.DefaultOpts.WithName(name))
 	if err != nil {

internal/shutils/handlers/fakeroot.go

@@ -29,9 +29,9 @@ import (
 	"syscall"
 	"time"
 
+	"gitea.plemya-x.ru/Plemya-x/fakeroot"
 	"mvdan.cc/sh/v3/expand"
 	"mvdan.cc/sh/v3/interp"
-	"gitea.plemya-x.ru/Plemya-x/fakeroot"
 )
 
 // FakerootExecHandler was extracted from github.com/mvdan/sh/interp/handler.go

internal/shutils/handlers/nop.go

@@ -22,10 +22,11 @@ package handlers
 import (
 	"context"
 	"io"
+	"io/fs"
 	"os"
 )
 
-func NopReadDir(context.Context, string) ([]os.FileInfo, error) {
+func NopReadDir(context.Context, string) ([]fs.DirEntry, error) {
 	return nil, os.ErrNotExist
 }
 

internal/shutils/handlers/restricted.go

@@ -31,12 +31,12 @@ import (
 	"mvdan.cc/sh/v3/interp"
 )
 
-func RestrictedReadDir(allowedPrefixes ...string) interp.ReadDirHandlerFunc {
-	return func(ctx context.Context, s string) ([]fs.FileInfo, error) {
+func RestrictedReadDir(allowedPrefixes ...string) interp.ReadDirHandlerFunc2 {
+	return func(ctx context.Context, s string) ([]fs.DirEntry, error) {
 		path := filepath.Clean(s)
 		for _, allowedPrefix := range allowedPrefixes {
 			if strings.HasPrefix(path, allowedPrefix) {
-				return interp.DefaultReadDirHandler()(ctx, s)
+				return interp.DefaultReadDirHandler2()(ctx, s)
 			}
 		}
 

internal/translations/default.pot

@@ -9,40 +9,60 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: build.go:41
+#: build.go:44
 msgid "Build a local package"
 msgstr ""
 
-#: build.go:47
+#: build.go:50
 msgid "Path to the build script"
 msgstr ""
 
-#: build.go:52
+#: build.go:55
+msgid "Specify subpackage in script (for multi package script only)"
+msgstr ""
+
+#: build.go:60
 msgid "Name of the package to build and its repo (example: default/go-bin)"
 msgstr ""
 
-#: build.go:57
+#: build.go:65
 msgid ""
 "Build package from scratch even if there's an already built package available"
 msgstr ""
 
-#: build.go:87
+#: build.go:73
+msgid "Error loading config"
+msgstr ""
+
+#: build.go:81
+msgid "Error initialization database"
+msgstr ""
+
+#: build.go:110
+msgid "Package not found"
+msgstr ""
+
+#: build.go:130
 msgid "Error pulling repositories"
 msgstr ""
 
-#: build.go:95
+#: build.go:138
 msgid "Unable to detect a supported package manager on the system"
 msgstr ""
 
-#: build.go:107
+#: build.go:144
+msgid "Error parsing os release"
+msgstr ""
+
+#: build.go:166
 msgid "Error building package"
 msgstr ""
 
-#: build.go:114
+#: build.go:173
 msgid "Error getting working directory"
 msgstr ""
 
-#: build.go:123
+#: build.go:182
 msgid "Error moving the package"
 msgstr ""
 
@@ -50,27 +70,27 @@ msgstr ""
 msgid "Attempt to fix problems with ALR"
 msgstr ""
 
-#: fix.go:44
+#: fix.go:49
 msgid "Removing cache directory"
 msgstr ""
 
-#: fix.go:48
+#: fix.go:53
 msgid "Unable to remove cache directory"
 msgstr ""
 
-#: fix.go:52
+#: fix.go:57
 msgid "Rebuilding cache"
 msgstr ""
 
-#: fix.go:56
+#: fix.go:61
 msgid "Unable to create new cache directory"
 msgstr ""
 
-#: fix.go:62
+#: fix.go:81
 msgid "Error pulling repos"
 msgstr ""
 
-#: fix.go:66
+#: fix.go:85
 msgid "Done"
 msgstr ""
 
@@ -98,63 +118,59 @@ msgstr ""
 msgid "No such helper command"
 msgstr ""
 
-#: info.go:42
+#: info.go:43
 msgid "Print information about a package"
 msgstr ""
 
-#: info.go:47
+#: info.go:48
 msgid "Show all information, not just for the current distro"
 msgstr ""
 
-#: info.go:57
-msgid "Error initialization database"
-msgstr ""
-
-#: info.go:64
-msgid "Command info expected at least 1 argument, got %d"
-msgstr ""
-
-#: info.go:78
-msgid "Error finding packages"
-msgstr ""
-
-#: info.go:94
-msgid "Error parsing os-release file"
-msgstr ""
-
-#: info.go:103
-msgid "Error resolving overrides"
-msgstr ""
-
-#: info.go:112 info.go:118
-msgid "Error encoding script variables"
-msgstr ""
-
-#: install.go:42
-msgid "Install a new package"
-msgstr ""
-
-#: install.go:56
-msgid "Command install expected at least 1 argument, got %d"
-msgstr ""
-
-#: install.go:91
+#: info.go:69
 msgid "Error getting packages"
 msgstr ""
 
-#: install.go:100
+#: info.go:78
 msgid "Error iterating over packages"
 msgstr ""
 
-#: install.go:113
+#: info.go:105
+msgid "Command info expected at least 1 argument, got %d"
+msgstr ""
+
+#: info.go:119
+msgid "Error finding packages"
+msgstr ""
+
+#: info.go:144
+msgid "Error parsing os-release file"
+msgstr ""
+
+#: info.go:153
+msgid "Error resolving overrides"
+msgstr ""
+
+#: info.go:162 info.go:168
+msgid "Error encoding script variables"
+msgstr ""
+
+#: install.go:43
+msgid "Install a new package"
+msgstr ""
+
+#: install.go:57
+msgid "Command install expected at least 1 argument, got %d"
+msgstr ""
+
+#: install.go:163
 msgid "Remove an installed package"
 msgstr ""
 
-#: install.go:118
+#: install.go:168
 msgid "Command remove expected at least 1 argument, got %d"
 msgstr ""
 
-#: install.go:130
+#: install.go:183
 msgid "Error removing packages"
 msgstr ""
 
@@ -182,59 +198,83 @@ msgstr ""
 msgid "Choose which optional package(s) to install"
 msgstr ""
 
-#: internal/config/config.go:64
-msgid "Error opening config file, using defaults"
+#: internal/cliutils/template.go:74 internal/cliutils/template.go:93
+msgid "NAME"
 msgstr ""
 
-#: internal/config/config.go:77
-msgid "Error decoding config file, using defaults"
+#: internal/cliutils/template.go:74 internal/cliutils/template.go:94
+msgid "USAGE"
 msgstr ""
 
-#: internal/config/config.go:89
-msgid "Unable to detect user config directory"
+#: internal/cliutils/template.go:74
+msgid "global options"
 msgstr ""
 
-#: internal/config/config.go:97
-msgid "Unable to create ALR config directory"
+#: internal/cliutils/template.go:74
+msgid "command"
 msgstr ""
 
-#: internal/config/config.go:106
-msgid "Unable to create ALR config file"
+#: internal/cliutils/template.go:74 internal/cliutils/template.go:95
+msgid "command options"
 msgstr ""
 
-#: internal/config/config.go:112
-msgid "Error encoding default configuration"
+#: internal/cliutils/template.go:74 internal/cliutils/template.go:96
+msgid "arguments"
 msgstr ""
 
-#: internal/config/config.go:121
-msgid "Unable to detect cache directory"
+#: internal/cliutils/template.go:74
+msgid "VERSION"
 msgstr ""
 
-#: internal/config/config.go:131
+#: internal/cliutils/template.go:74 internal/cliutils/template.go:98
+msgid "DESCRIPTION"
+msgstr ""
+
+#: internal/cliutils/template.go:74
+msgid "AUTHOR"
+msgstr ""
+
+#: internal/cliutils/template.go:74
+msgid "COMMANDS"
+msgstr ""
+
+#: internal/cliutils/template.go:74
+msgid "GLOBAL OPTIONS"
+msgstr ""
+
+#: internal/cliutils/template.go:74
+msgid "COPYRIGHT"
+msgstr ""
+
+#: internal/cliutils/template.go:97
+msgid "CATEGORY"
+msgstr ""
+
+#: internal/cliutils/template.go:99 internal/cliutils/template.go:100
+msgid "OPTIONS"
+msgstr ""
+
+#: internal/config/config.go:176
+msgid "Unable to create config directory"
+msgstr ""
+
+#: internal/config/config.go:182
 msgid "Unable to create repo cache directory"
 msgstr ""
 
-#: internal/config/config.go:137
+#: internal/config/config.go:188
 msgid "Unable to create package cache directory"
 msgstr ""
 
-#: internal/config/lang.go:49
-msgid "Error parsing system language"
-msgstr ""
-
-#: internal/db/db.go:131
+#: internal/db/db.go:133
 msgid "Database version mismatch; resetting"
 msgstr ""
 
-#: internal/db/db.go:138
+#: internal/db/db.go:140
 msgid ""
 "Database version does not exist. Run alr fix if something isn't working."
 msgstr ""
 
-#: internal/db/db_legacy.go:101
-msgid "Error opening database"
-msgstr ""
-
 #: internal/dl/dl.go:170
 msgid "Source can be updated, updating if required"
 msgstr ""
@@ -263,11 +303,11 @@ msgstr ""
 msgid "ERROR"
 msgstr ""
 
-#: list.go:40
+#: list.go:41
 msgid "List ALR repo packages"
 msgstr ""
 
-#: list.go:91
+#: list.go:98
 msgid "Error listing installed packages"
 msgstr ""
 
@@ -283,92 +323,92 @@ msgstr ""
 msgid "Enable interactive questions and prompts"
 msgstr ""
 
-#: main.go:90
+#: main.go:96
 msgid ""
 "Running ALR as root is forbidden as it may cause catastrophic damage to your "
 "system"
 msgstr ""
 
-#: main.go:124
+#: main.go:154
+msgid "Show help"
+msgstr ""
+
+#: main.go:158
 msgid "Error while running app"
 msgstr ""
 
-#: pkg/build/build.go:108
+#: pkg/build/build.go:156
 msgid "Failed to prompt user to view build script"
 msgstr ""
 
-#: pkg/build/build.go:112
+#: pkg/build/build.go:160
 msgid "Building package"
 msgstr ""
 
-#: pkg/build/build.go:156
+#: pkg/build/build.go:208
+msgid "The checksums array must be the same length as sources"
+msgstr ""
+
+#: pkg/build/build.go:235
 msgid "Downloading sources"
 msgstr ""
 
-#: pkg/build/build.go:168
+#: pkg/build/build.go:257
 msgid "Building package metadata"
 msgstr ""
 
-#: pkg/build/build.go:190
+#: pkg/build/build.go:279
 msgid "Compressing package"
 msgstr ""
 
-#: pkg/build/build.go:316
+#: pkg/build/build.go:438
 msgid ""
 "Your system's CPU architecture doesn't match this package. Do you want to "
 "build anyway?"
 msgstr ""
 
-#: pkg/build/build.go:327
+#: pkg/build/build.go:452
 msgid "This package is already installed"
 msgstr ""
 
-#: pkg/build/build.go:355
+#: pkg/build/build.go:476
 msgid "Installing build dependencies"
 msgstr ""
 
-#: pkg/build/build.go:397
+#: pkg/build/build.go:521
 msgid "Installing dependencies"
 msgstr ""
 
-#: pkg/build/build.go:443
-msgid "Executing version()"
-msgstr ""
-
-#: pkg/build/build.go:463
-msgid "Updating version"
-msgstr ""
-
-#: pkg/build/build.go:468
-msgid "Executing prepare()"
-msgstr ""
-
-#: pkg/build/build.go:478
-msgid "Executing build()"
-msgstr ""
-
-#: pkg/build/build.go:488
-msgid "Executing package()"
-msgstr ""
-
-#: pkg/build/build.go:510
-msgid "Executing files()"
-msgstr ""
-
-#: pkg/build/build.go:588
-msgid "AutoProv is not implemented for this package format, so it's skipped"
-msgstr ""
-
-#: pkg/build/build.go:599
-msgid "AutoReq is not implemented for this package format, so it's skipped"
-msgstr ""
-
-#: pkg/build/build.go:706
+#: pkg/build/build.go:602
 msgid "Would you like to remove the build dependencies?"
 msgstr ""
 
-#: pkg/build/build.go:812
-msgid "The checksums array must be the same length as sources"
+#: pkg/build/build.go:665
+msgid "Executing prepare()"
+msgstr ""
+
+#: pkg/build/build.go:675
+msgid "Executing build()"
+msgstr ""
+
+#: pkg/build/build.go:705 pkg/build/build.go:725
+msgid "Executing %s()"
+msgstr ""
+
+#: pkg/build/build.go:784
+msgid "Error installing native packages"
+msgstr ""
+
+#: pkg/build/build.go:808
+msgid "Error installing package"
+msgstr ""
+
+#: pkg/build/build.go:867
+msgid "AutoProv is not implemented for this package format, so it's skipped"
+msgstr ""
+
+#: pkg/build/build.go:878
+msgid "AutoReq is not implemented for this package format, so it's skipped"
 msgstr ""
 
 #: pkg/build/findDeps.go:35
@@ -383,84 +423,104 @@ msgstr ""
 msgid "Required dependency found"
 msgstr ""
 
-#: pkg/build/install.go:42
-msgid "Error installing native packages"
-msgstr ""
-
-#: pkg/build/install.go:79
-msgid "Error installing package"
-msgstr ""
-
-#: pkg/repos/pull.go:75
+#: pkg/repos/pull.go:79
 msgid "Pulling repository"
 msgstr ""
 
-#: pkg/repos/pull.go:99
+#: pkg/repos/pull.go:103
 msgid "Repository up to date"
 msgstr ""
 
-#: pkg/repos/pull.go:156
+#: pkg/repos/pull.go:160
 msgid "Git repository does not appear to be a valid ALR repo"
 msgstr ""
 
-#: pkg/repos/pull.go:172
+#: pkg/repos/pull.go:176
 msgid ""
 "ALR repo's minimum ALR version is greater than the current version. Try "
 "updating ALR if something doesn't work."
 msgstr ""
 
-#: repo.go:41
+#: repo.go:40
 msgid "Add a new repository"
 msgstr ""
 
-#: repo.go:48
+#: repo.go:47
 msgid "Name of the new repo"
 msgstr ""
 
-#: repo.go:54
+#: repo.go:53
 msgid "URL of the new repo"
 msgstr ""
 
-#: repo.go:79 repo.go:136
-msgid "Error opening config file"
+#: repo.go:86 repo.go:156
+msgid "Error saving config"
 msgstr ""
 
-#: repo.go:85 repo.go:142
-msgid "Error encoding config"
-msgstr ""
-
-#: repo.go:103
+#: repo.go:111
 msgid "Remove an existing repository"
 msgstr ""
 
-#: repo.go:110
+#: repo.go:118
 msgid "Name of the repo to be deleted"
 msgstr ""
 
-#: repo.go:128
+#: repo.go:142
 msgid "Repo does not exist"
 msgstr ""
 
-#: repo.go:148
+#: repo.go:150
 msgid "Error removing repo directory"
 msgstr ""
 
-#: repo.go:154
+#: repo.go:167
 msgid "Error removing packages from database"
 msgstr ""
 
-#: repo.go:166
+#: repo.go:179
 msgid "Pull all repositories that have changed"
 msgstr ""
 
+#: search.go:36
+msgid "Search packages"
+msgstr ""
+
+#: search.go:42
+msgid "Search by name"
+msgstr ""
+
+#: search.go:47
+msgid "Search by description"
+msgstr ""
+
+#: search.go:52
+msgid "Search by repository"
+msgstr ""
+
+#: search.go:57
+msgid "Search by provides"
+msgstr ""
+
+#: search.go:62
+msgid "Format output using a Go template"
+msgstr ""
+
+#: search.go:88 search.go:105
+msgid "Error parsing format template"
+msgstr ""
+
+#: search.go:113
+msgid "Error executing template"
+msgstr ""
+
 #: upgrade.go:47
 msgid "Upgrade all installed packages"
 msgstr ""
 
-#: upgrade.go:83
+#: upgrade.go:96
 msgid "Error checking for updates"
 msgstr ""
 
-#: upgrade.go:94
+#: upgrade.go:118
 msgid "There is nothing to do."
 msgstr ""

internal/translations/po/ru/default.po

@@ -1,12 +1,12 @@
 #
-# Maxim Slipenko <maks1ms@alt-gnome.ru>, 2025.
 # x1z53 <x1z53@yandex.ru>, 2025.
+# Maxim Slipenko <maks1ms@alt-gnome.ru>, 2025.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: unnamed project\n"
-"PO-Revision-Date: 2025-01-24 21:20+0300\n"
-"Last-Translator: x1z53 <x1z53@yandex.ru>\n"
+"PO-Revision-Date: 2025-03-09 17:31+0300\n"
+"Last-Translator: Maxim Slipenko <maks1ms@alt-gnome.ru>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -16,40 +16,61 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Gtranslator 47.1\n"
 
-#: build.go:41
+#: build.go:44
 msgid "Build a local package"
 msgstr "Сборка локального пакета"
 
-#: build.go:47
+#: build.go:50
 msgid "Path to the build script"
 msgstr "Путь к скрипту сборки"
 
-#: build.go:52
+#: build.go:55
+msgid "Specify subpackage in script (for multi package script only)"
+msgstr "Укажите подпакет в скрипте (только для многопакетного скрипта)"
+
+#: build.go:60
 msgid "Name of the package to build and its repo (example: default/go-bin)"
 msgstr "Имя пакета для сборки и его репозиторий (пример: default/go-bin)"
 
-#: build.go:57
+#: build.go:65
 msgid ""
 "Build package from scratch even if there's an already built package available"
 msgstr "Создайте пакет с нуля, даже если уже имеется готовый пакет"
 
-#: build.go:87
+#: build.go:73
+#, fuzzy
+msgid "Error loading config"
+msgstr "Ошибка при кодировании конфигурации"
+
+#: build.go:81
+msgid "Error initialization database"
+msgstr "Ошибка инициализации базы данных"
+
+#: build.go:110
+msgid "Package not found"
+msgstr "Пакет не найден"
+
+#: build.go:130
 msgid "Error pulling repositories"
 msgstr "Ошибка при извлечении репозиториев"
 
-#: build.go:95
+#: build.go:138
 msgid "Unable to detect a supported package manager on the system"
 msgstr "Не удалось обнаружить поддерживаемый менеджер пакетов в системе"
 
-#: build.go:107
+#: build.go:144
+msgid "Error parsing os release"
+msgstr "Ошибка при разборе файла выпуска операционной системы"
+
+#: build.go:166
 msgid "Error building package"
 msgstr "Ошибка при сборке пакета"
 
-#: build.go:114
+#: build.go:173
 msgid "Error getting working directory"
 msgstr "Ошибка при получении рабочего каталога"
 
-#: build.go:123
+#: build.go:182
 msgid "Error moving the package"
 msgstr "Ошибка при перемещении пакета"
 
@@ -57,27 +78,27 @@ msgstr "Ошибка при перемещении пакета"
 msgid "Attempt to fix problems with ALR"
 msgstr "Попытка устранить проблемы с ALR"
 
-#: fix.go:44
+#: fix.go:49
 msgid "Removing cache directory"
 msgstr "Удаление каталога кэша"
 
-#: fix.go:48
+#: fix.go:53
 msgid "Unable to remove cache directory"
 msgstr "Не удалось удалить каталог кэша"
 
-#: fix.go:52
+#: fix.go:57
 msgid "Rebuilding cache"
 msgstr "Восстановление кэша"
 
-#: fix.go:56
+#: fix.go:61
 msgid "Unable to create new cache directory"
 msgstr "Не удалось создать новый каталог кэша"
 
-#: fix.go:62
+#: fix.go:81
 msgid "Error pulling repos"
 msgstr "Ошибка при извлечении репозиториев"
 
-#: fix.go:66
+#: fix.go:85
 msgid "Done"
 msgstr "Сделано"
 
@@ -105,63 +126,59 @@ msgstr "Каталог, в который будут устанавливать
 msgid "No such helper command"
 msgstr "Такой вспомогательной команды нет"
 
-#: info.go:42
+#: info.go:43
 msgid "Print information about a package"
 msgstr "Отобразить информацию о пакете"
 
-#: info.go:47
+#: info.go:48
 msgid "Show all information, not just for the current distro"
 msgstr "Показывать всю информацию, не только для текущего дистрибутива"
 
-#: info.go:57
-msgid "Error initialization database"
-msgstr "Ошибка инициализации базы данных"
-
-#: info.go:64
-msgid "Command info expected at least 1 argument, got %d"
-msgstr "Для команды info ожидался хотя бы 1 аргумент, получено %d"
-
-#: info.go:78
-msgid "Error finding packages"
-msgstr "Ошибка при поиске пакетов"
-
-#: info.go:94
-msgid "Error parsing os-release file"
-msgstr "Ошибка при разборе файла выпуска операционной системы"
-
-#: info.go:103
-msgid "Error resolving overrides"
-msgstr "Ошибка устранения переорпеделений"
-
-#: info.go:112 info.go:118
-msgid "Error encoding script variables"
-msgstr "Ошибка кодирования переменных скрита"
-
-#: install.go:42
-msgid "Install a new package"
-msgstr "Установить новый пакет"
-
-#: install.go:56
-msgid "Command install expected at least 1 argument, got %d"
-msgstr "Для команды install ожидался хотя бы 1 аргумент, получено %d"
-
-#: install.go:91
+#: info.go:69
 msgid "Error getting packages"
 msgstr "Ошибка при получении пакетов"
 
-#: install.go:100
+#: info.go:78
 msgid "Error iterating over packages"
 msgstr "Ошибка при переборе пакетов"
 
-#: install.go:113
+#: info.go:105
+msgid "Command info expected at least 1 argument, got %d"
+msgstr "Для команды info ожидался хотя бы 1 аргумент, получено %d"
+
+#: info.go:119
+msgid "Error finding packages"
+msgstr "Ошибка при поиске пакетов"
+
+#: info.go:144
+msgid "Error parsing os-release file"
+msgstr "Ошибка при разборе файла выпуска операционной системы"
+
+#: info.go:153
+msgid "Error resolving overrides"
+msgstr "Ошибка устранения переорпеделений"
+
+#: info.go:162 info.go:168
+msgid "Error encoding script variables"
+msgstr "Ошибка кодирования переменных скрита"
+
+#: install.go:43
+msgid "Install a new package"
+msgstr "Установить новый пакет"
+
+#: install.go:57
+msgid "Command install expected at least 1 argument, got %d"
+msgstr "Для команды install ожидался хотя бы 1 аргумент, получено %d"
+
+#: install.go:163
 msgid "Remove an installed package"
 msgstr "Удалить установленный пакет"
 
-#: install.go:118
+#: install.go:168
 msgid "Command remove expected at least 1 argument, got %d"
 msgstr "Для команды remove ожидался хотя бы 1 аргумент, получено %d"
 
-#: install.go:130
+#: install.go:183
 msgid "Error removing packages"
 msgstr "Ошибка при удалении пакетов"
 
@@ -189,64 +206,85 @@ msgstr "Выберите, какой пакет использовать для
 msgid "Choose which optional package(s) to install"
 msgstr "Выберите, какой дополнительный пакет(ы) следует установить"
 
-#: internal/config/config.go:64
-msgid "Error opening config file, using defaults"
-msgstr ""
-"Ошибка при открытии конфигурационного файла, используются значения по "
-"умолчанию"
+#: internal/cliutils/template.go:74 internal/cliutils/template.go:93
+msgid "NAME"
+msgstr "НАЗВАНИЕ"
 
-#: internal/config/config.go:77
-msgid "Error decoding config file, using defaults"
-msgstr ""
-"Ошибка при декодировании конфигурационного файла, используются значения по "
-"умолчанию"
+#: internal/cliutils/template.go:74 internal/cliutils/template.go:94
+msgid "USAGE"
+msgstr "ИСПОЛЬЗОВАНИЕ"
 
-#: internal/config/config.go:89
-msgid "Unable to detect user config directory"
-msgstr "Не удалось обнаружить каталог конфигурации пользователя"
+#: internal/cliutils/template.go:74
+msgid "global options"
+msgstr "глобальные опции"
 
-#: internal/config/config.go:97
-msgid "Unable to create ALR config directory"
+#: internal/cliutils/template.go:74
+msgid "command"
+msgstr "команда"
+
+#: internal/cliutils/template.go:74 internal/cliutils/template.go:95
+msgid "command options"
+msgstr "опции команды"
+
+#: internal/cliutils/template.go:74 internal/cliutils/template.go:96
+msgid "arguments"
+msgstr "аргументы"
+
+#: internal/cliutils/template.go:74
+msgid "VERSION"
+msgstr "ВЕРСИЯ"
+
+#: internal/cliutils/template.go:74 internal/cliutils/template.go:98
+msgid "DESCRIPTION"
+msgstr "ОПИСАНИЕ"
+
+#: internal/cliutils/template.go:74
+msgid "AUTHOR"
+msgstr "АВТОР"
+
+#: internal/cliutils/template.go:74
+msgid "COMMANDS"
+msgstr "КОМАНДЫ"
+
+#: internal/cliutils/template.go:74
+msgid "GLOBAL OPTIONS"
+msgstr "ГЛОБАЛЬНЫЕ ОПЦИИ"
+
+#: internal/cliutils/template.go:74
+msgid "COPYRIGHT"
+msgstr "АВТОРСКОЕ ПРАВО"
+
+#: internal/cliutils/template.go:97
+msgid "CATEGORY"
+msgstr "КАТЕГОРИЯ"
+
+#: internal/cliutils/template.go:99 internal/cliutils/template.go:100
+msgid "OPTIONS"
+msgstr "ПАРАМЕТРЫ"
+
+#: internal/config/config.go:176
+#, fuzzy
+msgid "Unable to create config directory"
 msgstr "Не удалось создать каталог конфигурации ALR"
 
-#: internal/config/config.go:106
-msgid "Unable to create ALR config file"
-msgstr "Не удалось создать конфигурационный файл ALR"
-
-#: internal/config/config.go:112
-msgid "Error encoding default configuration"
-msgstr "Ошибка кодирования конфигурации по умолчанию"
-
-#: internal/config/config.go:121
-msgid "Unable to detect cache directory"
-msgstr "Не удалось обнаружить каталог кэша"
-
-#: internal/config/config.go:131
+#: internal/config/config.go:182
 msgid "Unable to create repo cache directory"
 msgstr "Не удалось создать каталог кэша репозитория"
 
-#: internal/config/config.go:137
+#: internal/config/config.go:188
 msgid "Unable to create package cache directory"
 msgstr "Не удалось создать каталог кэша пакетов"
 
-#: internal/config/lang.go:49
-msgid "Error parsing system language"
-msgstr "Ошибка при парсинге языка системы"
-
-#: internal/db/db.go:131
+#: internal/db/db.go:133
 msgid "Database version mismatch; resetting"
 msgstr "Несоответствие версий базы данных; сброс настроек"
 
-#: internal/db/db.go:138
+#: internal/db/db.go:140
 msgid ""
 "Database version does not exist. Run alr fix if something isn't working."
 msgstr ""
 "Версия базы данных не существует. Запустите alr fix, если что-то не работает."
 
-#: internal/db/db_legacy.go:101
-msgid "Error opening database"
-msgstr "Ошибка при открытии базы данных"
-
 #: internal/dl/dl.go:170
 msgid "Source can be updated, updating if required"
 msgstr "Исходный код можно обновлять, обновляя при необходимости"
@@ -265,21 +303,21 @@ msgstr "Скачивание источника"
 
 #: internal/dl/progress_tui.go:100
 msgid "%s: done!\n"
-msgstr ""
+msgstr "%s: выполнено!\n"
 
 #: internal/dl/progress_tui.go:104
 msgid "%s %s downloading at %s/s\n"
-msgstr ""
+msgstr "%s %s загружается — %s/с\n"
 
 #: internal/logger/log.go:47
 msgid "ERROR"
 msgstr "ОШИБКА"
 
-#: list.go:40
+#: list.go:41
 msgid "List ALR repo packages"
 msgstr "Список пакетов репозитория ALR"
 
-#: list.go:91
+#: list.go:98
 msgid "Error listing installed packages"
 msgstr "Ошибка при составлении списка установленных пакетов"
 
@@ -295,7 +333,7 @@ msgstr "Аргументы, которые будут переданы мене
 msgid "Enable interactive questions and prompts"
 msgstr "Включение интерактивных вопросов и запросов"
 
-#: main.go:90
+#: main.go:96
 msgid ""
 "Running ALR as root is forbidden as it may cause catastrophic damage to your "
 "system"
@@ -303,31 +341,39 @@ msgstr ""
 "Запуск ALR от имени root запрещён, так как это может привести к "
 "катастрофическому повреждению вашей системы"
 
-#: main.go:124
+#: main.go:154
+msgid "Show help"
+msgstr "Показать справку"
+
+#: main.go:158
 msgid "Error while running app"
 msgstr "Ошибка при запуске приложения"
 
-#: pkg/build/build.go:108
+#: pkg/build/build.go:156
 msgid "Failed to prompt user to view build script"
 msgstr "Не удалось предложить пользователю просмотреть скрипт сборки"
 
-#: pkg/build/build.go:112
+#: pkg/build/build.go:160
 msgid "Building package"
 msgstr "Сборка пакета"
 
-#: pkg/build/build.go:156
+#: pkg/build/build.go:208
+msgid "The checksums array must be the same length as sources"
+msgstr "Массив контрольных сумм должен быть той же длины, что и источники"
+
+#: pkg/build/build.go:235
 msgid "Downloading sources"
 msgstr "Скачивание источников"
 
-#: pkg/build/build.go:168
+#: pkg/build/build.go:257
 msgid "Building package metadata"
 msgstr "Сборка метаданных пакета"
 
-#: pkg/build/build.go:190
+#: pkg/build/build.go:279
 msgid "Compressing package"
 msgstr "Сжатие пакета"
 
-#: pkg/build/build.go:316
+#: pkg/build/build.go:438
 msgid ""
 "Your system's CPU architecture doesn't match this package. Do you want to "
 "build anyway?"
@@ -335,60 +381,52 @@ msgstr ""
 "Архитектура процессора вашей системы не соответствует этому пакету. Вы все "
 "равно хотите выполнить сборку?"
 
-#: pkg/build/build.go:327
+#: pkg/build/build.go:452
 msgid "This package is already installed"
 msgstr "Этот пакет уже установлен"
 
-#: pkg/build/build.go:355
+#: pkg/build/build.go:476
 msgid "Installing build dependencies"
 msgstr "Установка зависимостей сборки"
 
-#: pkg/build/build.go:397
+#: pkg/build/build.go:521
 msgid "Installing dependencies"
 msgstr "Установка зависимостей"
 
-#: pkg/build/build.go:443
-msgid "Executing version()"
-msgstr "Исполнение версия()"
+#: pkg/build/build.go:602
+msgid "Would you like to remove the build dependencies?"
+msgstr "Хотели бы вы удалить зависимости сборки?"
 
-#: pkg/build/build.go:463
-msgid "Updating version"
-msgstr "Обновление версии"
-
-#: pkg/build/build.go:468
+#: pkg/build/build.go:665
 msgid "Executing prepare()"
 msgstr "Исполнение prepare()"
 
-#: pkg/build/build.go:478
+#: pkg/build/build.go:675
 msgid "Executing build()"
 msgstr "Исполнение build()"
 
-#: pkg/build/build.go:488
-msgid "Executing package()"
-msgstr "Исполнение package()"
+#: pkg/build/build.go:705 pkg/build/build.go:725
+msgid "Executing %s()"
+msgstr "Исполнение %s()"
 
-#: pkg/build/build.go:510
-msgid "Executing files()"
-msgstr "Исполнение files()"
+#: pkg/build/build.go:784
+msgid "Error installing native packages"
+msgstr "Ошибка при установке нативных пакетов"
 
-#: pkg/build/build.go:588
+#: pkg/build/build.go:808
+msgid "Error installing package"
+msgstr "Ошибка при установке пакета"
+
+#: pkg/build/build.go:867
 msgid "AutoProv is not implemented for this package format, so it's skipped"
 msgstr ""
 "AutoProv не реализовано для этого формата пакета, поэтому будет пропущено"
 
-#: pkg/build/build.go:599
+#: pkg/build/build.go:878
 msgid "AutoReq is not implemented for this package format, so it's skipped"
 msgstr ""
 "AutoReq не реализовано для этого формата пакета, поэтому будет пропущено"
 
-#: pkg/build/build.go:706
-msgid "Would you like to remove the build dependencies?"
-msgstr "Хотели бы вы удалить зависимости сборки?"
-
-#: pkg/build/build.go:812
-msgid "The checksums array must be the same length as sources"
-msgstr "Массив контрольных сумм должен быть той же длины, что и источники"
-
 #: pkg/build/findDeps.go:35
 msgid "Command not found on the system"
 msgstr "Команда не найдена в системе"
@@ -401,27 +439,19 @@ msgstr "Найденная предоставленная зависимость
 msgid "Required dependency found"
 msgstr "Найдена требуемая зависимость"
 
-#: pkg/build/install.go:42
-msgid "Error installing native packages"
-msgstr "Ошибка при установке нативных пакетов"
-
-#: pkg/build/install.go:79
-msgid "Error installing package"
-msgstr "Ошибка при установке пакета"
-
-#: pkg/repos/pull.go:75
+#: pkg/repos/pull.go:79
 msgid "Pulling repository"
 msgstr "Скачивание репозитория"
 
-#: pkg/repos/pull.go:99
+#: pkg/repos/pull.go:103
 msgid "Repository up to date"
 msgstr "Репозиторий уже обновлён"
 
-#: pkg/repos/pull.go:156
+#: pkg/repos/pull.go:160
 msgid "Git repository does not appear to be a valid ALR repo"
 msgstr "Репозиторий Git не поддерживается репозиторием ALR"
 
-#: pkg/repos/pull.go:172
+#: pkg/repos/pull.go:176
 msgid ""
 "ALR repo's minimum ALR version is greater than the current version. Try "
 "updating ALR if something doesn't work."
@@ -429,58 +459,127 @@ msgstr ""
 "Минимальная версия ALR для ALR-репозитория выше текущей версии. Попробуйте "
 "обновить ALR, если что-то не работает."
 
-#: repo.go:41
+#: repo.go:40
 msgid "Add a new repository"
 msgstr "Добавить новый репозиторий"
 
-#: repo.go:48
+#: repo.go:47
 msgid "Name of the new repo"
 msgstr "Название нового репозитория"
 
-#: repo.go:54
+#: repo.go:53
 msgid "URL of the new repo"
 msgstr "URL-адрес нового репозитория"
 
-#: repo.go:79 repo.go:136
-msgid "Error opening config file"
-msgstr "Ошибка при открытии конфигурационного файла"
-
-#: repo.go:85 repo.go:142
-msgid "Error encoding config"
+#: repo.go:86 repo.go:156
+#, fuzzy
+msgid "Error saving config"
 msgstr "Ошибка при кодировании конфигурации"
 
-#: repo.go:103
+#: repo.go:111
 msgid "Remove an existing repository"
 msgstr "Удалить существующий репозиторий"
 
-#: repo.go:110
+#: repo.go:118
 msgid "Name of the repo to be deleted"
 msgstr "Название репозитория  удалён"
 
-#: repo.go:128
+#: repo.go:142
 msgid "Repo does not exist"
 msgstr "Репозитория не существует"
 
-#: repo.go:148
+#: repo.go:150
 msgid "Error removing repo directory"
 msgstr "Ошибка при удалении каталога репозитория"
 
-#: repo.go:154
+#: repo.go:167
 msgid "Error removing packages from database"
 msgstr "Ошибка при удалении пакетов из базы данных"
 
-#: repo.go:166
+#: repo.go:179
 msgid "Pull all repositories that have changed"
 msgstr "Скачать все изменённые репозитории"
 
+#: search.go:36
+msgid "Search packages"
+msgstr "Поиск пакетов"
+
+#: search.go:42
+msgid "Search by name"
+msgstr "Искать по имени"
+
+#: search.go:47
+msgid "Search by description"
+msgstr "Искать по описанию"
+
+#: search.go:52
+msgid "Search by repository"
+msgstr "Искать по репозиторию"
+
+#: search.go:57
+msgid "Search by provides"
+msgstr "Иcкать по provides"
+
+#: search.go:62
+msgid "Format output using a Go template"
+msgstr "Формат выходных данных с использованием шаблона Go"
+
+#: search.go:88 search.go:105
+msgid "Error parsing format template"
+msgstr "Ошибка при разборе шаблона"
+
+#: search.go:113
+msgid "Error executing template"
+msgstr "Ошибка при выполнении шаблона"
+
 #: upgrade.go:47
 msgid "Upgrade all installed packages"
 msgstr "Обновить все установленные пакеты"
 
-#: upgrade.go:83
+#: upgrade.go:96
 msgid "Error checking for updates"
 msgstr "Ошибка при проверке обновлений"
 
-#: upgrade.go:94
+#: upgrade.go:118
 msgid "There is nothing to do."
 msgstr "Здесь нечего делать."
+
+#~ msgid "Error opening config file, using defaults"
+#~ msgstr ""
+#~ "Ошибка при открытии конфигурационного файла, используются значения по "
+#~ "умолчанию"
+
+#~ msgid "Error decoding config file, using defaults"
+#~ msgstr ""
+#~ "Ошибка при декодировании конфигурационного файла, используются значения "
+#~ "по умолчанию"
+
+#~ msgid "Unable to detect user config directory"
+#~ msgstr "Не удалось обнаружить каталог конфигурации пользователя"
+
+#~ msgid "Unable to create ALR config file"
+#~ msgstr "Не удалось создать конфигурационный файл ALR"
+
+#~ msgid "Error encoding default configuration"
+#~ msgstr "Ошибка кодирования конфигурации по умолчанию"
+
+#~ msgid "Unable to detect cache directory"
+#~ msgstr "Не удалось обнаружить каталог кэша"
+
+#~ msgid "Error opening config file"
+#~ msgstr "Ошибка при открытии конфигурационного файла"
+
+#~ msgid "Error parsing system language"
+#~ msgstr "Ошибка при парсинге языка системы"
+
+#~ msgid "Error opening database"
+#~ msgstr "Ошибка при открытии базы данных"
+
+#~ msgid "Executing version()"
+#~ msgstr "Исполнение версия()"
+
+#~ msgid "Updating version"
+#~ msgstr "Обновление версии"
+
+#~ msgid "Executing package()"
+#~ msgstr "Исполнение package()"

internal/types/build.go

@@ -23,11 +23,62 @@ import "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 
 type BuildOpts struct {
 	Script      string
+	Repository  string
+	Packages    []string
 	Manager     manager.Manager
 	Clean       bool
 	Interactive bool
 }
 
+type BuildVarsPre struct {
+	Version       string   `sh:"version,required"`
+	Release       int      `sh:"release,required"`
+	Epoch         uint     `sh:"epoch"`
+	Description   string   `sh:"desc"`
+	Homepage      string   `sh:"homepage"`
+	Maintainer    string   `sh:"maintainer"`
+	Architectures []string `sh:"architectures"`
+	Licenses      []string `sh:"license"`
+	Provides      []string `sh:"provides"`
+	Conflicts     []string `sh:"conflicts"`
+	Depends       []string `sh:"deps"`
+	BuildDepends  []string `sh:"build_deps"`
+	OptDepends    []string `sh:"opt_deps"`
+	Replaces      []string `sh:"replaces"`
+	Sources       []string `sh:"sources"`
+	Checksums     []string `sh:"checksums"`
+	Backup        []string `sh:"backup"`
+	Scripts       Scripts  `sh:"scripts"`
+	AutoReq       []string `sh:"auto_req"`
+	AutoProv      []string `sh:"auto_prov"`
+}
+
+func (bv *BuildVarsPre) ToBuildVars() BuildVars {
+	return BuildVars{
+		Name:          "",
+		Version:       bv.Version,
+		Release:       bv.Release,
+		Epoch:         bv.Epoch,
+		Description:   bv.Description,
+		Homepage:      bv.Homepage,
+		Maintainer:    bv.Maintainer,
+		Architectures: bv.Architectures,
+		Licenses:      bv.Licenses,
+		Provides:      bv.Provides,
+		Conflicts:     bv.Conflicts,
+		Depends:       bv.Depends,
+		BuildDepends:  bv.BuildDepends,
+		OptDepends:    bv.OptDepends,
+		Replaces:      bv.Replaces,
+		Sources:       bv.Sources,
+		Checksums:     bv.Checksums,
+		Backup:        bv.Backup,
+		Scripts:       bv.Scripts,
+		AutoReq:       bv.AutoReq,
+		AutoProv:      bv.AutoProv,
+	}
+}
+
 // BuildVars represents the script variables required
 // to build a package
 type BuildVars struct {
@@ -52,6 +103,7 @@ type BuildVars struct {
 	Scripts       Scripts  `sh:"scripts"`
 	AutoReq       []string `sh:"auto_req"`
 	AutoProv      []string `sh:"auto_prov"`
+	Base          string
 }
 
 type Scripts struct {

internal/types/config.go

@@ -21,12 +21,13 @@ package types
 
 // Config represents the ALR configuration file
 type Config struct {
-	RootCmd          string   `toml:"rootCmd"`
-	PagerStyle       string   `toml:"pagerStyle"`
+	RootCmd          string   `toml:"rootCmd" env:"ALR_ROOT_CMD"`
+	PagerStyle       string   `toml:"pagerStyle" env:"ALR_PAGER_STYLE"`
 	IgnorePkgUpdates []string `toml:"ignorePkgUpdates"`
 	Repos            []Repo   `toml:"repo"`
 	Unsafe           Unsafe   `toml:"unsafe"`
-	AutoPull         bool     `toml:"autoPull"`
+	AutoPull         bool     `toml:"autoPull" env:"ALR_AUTOPULL"`
+	LogLevel         string   `toml:"logLevel" env:"ALR_LOG_LEVEL"`
 }
 
 // Repo represents a ALR repo within a configuration file
@@ -36,5 +37,5 @@ type Repo struct {
 }
 
 type Unsafe struct {
-	AllowRunAsRoot bool `toml:"allowRunAsRoot"`
+	AllowRunAsRoot bool `toml:"allowRunAsRoot" env:"ALR_UNSAFE_ALLOW_RUN_AS_ROOT"`
 }

list.go

@@ -30,6 +30,7 @@ import (
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
 	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
 )
@@ -48,16 +49,22 @@ func ListCmd() *cli.Command {
 		Action: func(c *cli.Context) error {
 			ctx := c.Context
 			cfg := config.New()
+			err := cfg.Load()
+			if err != nil {
+				slog.Error(gotext.Get("Error loading config"), "err", err)
+				os.Exit(1)
+			}
+
 			db := database.New(cfg)
-			err := db.Init(ctx)
+			err = db.Init(ctx)
 			if err != nil {
 				slog.Error(gotext.Get("Error initialization database"), "err", err)
 				os.Exit(1)
 			}
 			rs := repos.New(cfg, db)
 
-			if cfg.AutoPull(ctx) {
-				err = rs.Pull(ctx, cfg.Repos(ctx))
+			if cfg.AutoPull() {
+				err = rs.Pull(ctx, cfg.Repos())
 				if err != nil {
 					slog.Error(gotext.Get("Error pulling repositories"), "err", err)
 					os.Exit(1)
@@ -78,7 +85,7 @@ func ListCmd() *cli.Command {
 			}
 			defer result.Close()
 
-			var installed map[string]string
+			installedAlrPackages := map[string]string{}
 			if c.Bool("installed") {
 				mgr := manager.Detect()
 				if mgr == nil {
@@ -86,11 +93,20 @@ func ListCmd() *cli.Command {
 					os.Exit(1)
 				}
 
-				installed, err = mgr.ListInstalled(&manager.Opts{AsRoot: false})
+				installed, err := mgr.ListInstalled(&manager.Opts{AsRoot: false})
 				if err != nil {
 					slog.Error(gotext.Get("Error listing installed packages"), "err", err)
 					os.Exit(1)
 				}
+
+				for pkgName, version := range installed {
+					matches := build.RegexpALRPackageName.FindStringSubmatch(pkgName)
+					if matches != nil {
+						packageName := matches[build.RegexpALRPackageName.SubexpIndex("package")]
+						repoName := matches[build.RegexpALRPackageName.SubexpIndex("repo")]
+						installedAlrPackages[fmt.Sprintf("%s/%s", repoName, packageName)] = version
+					}
+				}
 			}
 
 			for result.Next() {
@@ -100,13 +116,13 @@ func ListCmd() *cli.Command {
 					return err
 				}
 
-				if slices.Contains(cfg.IgnorePkgUpdates(ctx), pkg.Name) {
+				if slices.Contains(cfg.IgnorePkgUpdates(), pkg.Name) {
 					continue
 				}
 
 				version := pkg.Version
 				if c.Bool("installed") {
-					instVersion, ok := installed[pkg.Name]
+					instVersion, ok := installedAlrPackages[fmt.Sprintf("%s/%s", pkg.Repository, pkg.Name)]
 					if !ok {
 						continue
 					} else {

main.go

@@ -31,8 +31,8 @@ import (
 	"github.com/mattn/go-isatty"
 	"github.com/urfave/cli/v2"
 
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/translations"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 
@@ -81,12 +81,18 @@ func GetApp() *cli.App {
 			GenCmd(),
 			HelperCmd(),
 			VersionCmd(),
+			SearchCmd(),
 		},
 		Before: func(c *cli.Context) error {
-			ctx := c.Context
+			cfg := config.New()
+			err := cfg.Load()
+			if err != nil {
+				slog.Error(gotext.Get("Error loading config"), "err", err)
+				os.Exit(1)
+			}
 
 			cmd := c.Args().First()
-			if cmd != "helper" && !config.Config(ctx).Unsafe.AllowRunAsRoot && os.Geteuid() == 0 {
+			if cmd != "helper" && !cfg.AllowRunAsRoot() && os.Geteuid() == 0 {
 				slog.Error(gotext.Get("Running ALR as root is forbidden as it may cause catastrophic damage to your system"))
 				os.Exit(1)
 			}
@@ -98,28 +104,56 @@ func GetApp() *cli.App {
 
 			return nil
 		},
-		After: func(ctx *cli.Context) error {
-			return db.Close()
-		},
 		EnableBashCompletion: true,
 	}
 }
 
-func main() {
-	translations.Setup()
-	logger.SetupDefault()
+func setLogLevel(newLevel string) {
+	level := slog.LevelInfo
+	switch newLevel {
+	case "DEBUG":
+		level = slog.LevelDebug
+	case "INFO":
+		level = slog.LevelInfo
+	case "WARN":
+		level = slog.LevelWarn
+	case "ERROR":
+		level = slog.LevelError
+	}
+	logger, ok := slog.Default().Handler().(*logger.Logger)
+	if !ok {
+		panic("unexpected")
+	}
+	logger.SetLevel(level)
+}
 
-	app := GetApp()
+func main() {
+	logger.SetupDefault()
+	setLogLevel(os.Getenv("ALR_LOG_LEVEL"))
+	translations.Setup()
 
 	ctx := context.Background()
 
+	app := GetApp()
+	cfg := config.New()
+	err := cfg.Load()
+	if err != nil {
+		slog.Error(gotext.Get("Error loading config"), "err", err)
+		os.Exit(1)
+	}
+	setLogLevel(cfg.LogLevel())
 	// Set the root command to the one set in the ALR config
-	manager.DefaultRootCmd = config.Config(ctx).RootCmd
+	manager.DefaultRootCmd = cfg.RootCmd()
 
 	ctx, cancel := signal.NotifyContext(ctx, syscall.SIGINT, syscall.SIGTERM)
 	defer cancel()
 
-	err := app.RunContext(ctx, os.Args)
+	// Make the application more internationalized
+	cli.AppHelpTemplate = cliutils.GetAppCliTemplate()
+	cli.CommandHelpTemplate = cliutils.GetCommandHelpTemplate()
+	cli.HelpFlag.(*cli.BoolFlag).Usage = gotext.Get("Show help")
+
+	err = app.RunContext(ctx, os.Args)
 	if err != nil {
 		slog.Error(gotext.Get("Error while running app"), "err", err)
 	}

pkg/build/build_internal_test.go

@@ -18,10 +18,18 @@ package build
 
 import (
 	"context"
+	"fmt"
+	"os"
+	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"mvdan.cc/sh/v3/syntax"
+
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
 	"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"
 )
 
@@ -134,93 +142,145 @@ func (m *TestManager) IsInstalled(pkg string) (bool, error) {
 	return true, nil
 }
 
-// TODO: fix test
-func TestInstallBuildDeps(t *testing.T) {
-	type testEnv struct {
-		pf   PackageFinder
-		vars *types.BuildVars
-		opts types.BuildOpts
+type TestConfig struct{}
 
-		// Contains pkgs captured by FindPkgsFunc
-		// capturedPkgs []string
+func (c *TestConfig) PagerStyle() string {
+	return "native"
+}
+
+func (c *TestConfig) GetPaths() *config.Paths {
+	return &config.Paths{
+		CacheDir: "/tmp",
 	}
+}
 
-	type testCase struct {
-		Name     string
-		Prepare  func() *testEnv
-		Expected func(t *testing.T, e *testEnv, res []string, err error)
-	}
+func TestExecuteFirstPassIsSecure(t *testing.T) {
+	cfg := &TestConfig{}
+	pf := &TestPackageFinder{}
+	info := &distro.OSRelease{}
+	m := &TestManager{}
 
-	for _, tc := range []testCase{
-		/*
-			{
-				Name: "install only needed deps",
-				Prepare: func() *testEnv {
-					pf := TestPackageFinder{}
-					vars := types.BuildVars{}
-					m := TestManager{}
 	opts := types.BuildOpts{
-						Manager:     &m,
+		Manager:     m,
 		Interactive: false,
 	}
 
-					env := &testEnv{
-						pf:           &pf,
-						vars:         &vars,
-						opts:         opts,
-						capturedPkgs: []string{},
-					}
-
-					pf.FindPkgsFunc = func(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error) {
-						env.capturedPkgs = append(env.capturedPkgs, pkgs...)
-						result := make(map[string][]db.Package)
-						result["bar"] = []db.Package{{
-							Name: "bar-pkg",
-						}}
-						result["buz"] = []db.Package{{
-							Name: "buz-pkg",
-						}}
-
-						return result, []string{}, nil
-					}
-
-					vars.BuildDepends = []string{
-						"foo",
-						"bar",
-						"buz",
-					}
-					m.IsInstalledFunc = func(pkg string) (bool, error) {
-						if pkg == "foo" {
-							return true, nil
-						} else {
-							return false, nil
-						}
-					}
-
-					return env
-				},
-				Expected: func(t *testing.T, e *testEnv, res []string, err error) {
-					assert.NoError(t, err)
-					assert.Len(t, res, 2)
-					assert.ElementsMatch(t, res, []string{"bar-pkg", "buz-pkg"})
-
-					assert.ElementsMatch(t, e.capturedPkgs, []string{"bar", "buz"})
-				},
-			},
-		*/
-	} {
-		t.Run(tc.Name, func(tt *testing.T) {
 	ctx := context.Background()
-			env := tc.Prepare()
 
-			result, err := installBuildDeps(
+	b := NewBuilder(
 		ctx,
-				env.pf,
-				env.vars,
-				env.opts,
+		opts,
+		pf,
+		info,
+		cfg,
 	)
 
-			tc.Expected(tt, env, result, err)
+	tmpFile, err := os.CreateTemp("", "testfile-")
+	assert.NoError(t, err)
+	tmpFilePath := tmpFile.Name()
+	defer os.Remove(tmpFilePath)
+
+	_, err = os.Stat(tmpFilePath)
+	assert.NoError(t, err)
+
+	testScript := fmt.Sprintf(`name='test'
+version=1.0.0
+release=1
+rm -f %s`, tmpFilePath)
+
+	fl, err := syntax.NewParser().Parse(strings.NewReader(testScript), "alr.sh")
+	assert.NoError(t, err)
+
+	_, _, err = b.executeFirstPass(fl)
+	assert.NoError(t, err)
+
+	_, err = os.Stat(tmpFilePath)
+	assert.NoError(t, err)
+}
+
+func TestExecuteFirstPassIsCorrect(t *testing.T) {
+	type testCase struct {
+		Name     string
+		Script   string
+		Opts     types.BuildOpts
+		Expected func(t *testing.T, vars []*types.BuildVars)
+	}
+
+	for _, tc := range []testCase{{
+		Name: "single package",
+		Script: `name='test'
+version='1.0.0'
+release=1
+epoch=2
+desc="Test package"
+homepage='https://example.com'
+maintainer='Ivan Ivanov'
+`,
+		Opts: types.BuildOpts{
+			Manager:     &TestManager{},
+			Interactive: false,
+		},
+		Expected: func(t *testing.T, vars []*types.BuildVars) {
+			assert.Equal(t, 1, len(vars))
+			assert.Equal(t, vars[0].Name, "test")
+			assert.Equal(t, vars[0].Version, "1.0.0")
+			assert.Equal(t, vars[0].Release, int(1))
+			assert.Equal(t, vars[0].Epoch, uint(2))
+			assert.Equal(t, vars[0].Description, "Test package")
+		},
+	}, {
+		Name: "multiple packages",
+		Script: `name=(
+	foo
+	bar
+)
+
+version='0.0.1'
+release=1
+epoch=2
+desc="Test package"
+
+meta_foo() {
+	desc="Foo package"
+}
+
+meta_bar() {
+
+}
+`,
+		Opts: types.BuildOpts{
+			Packages:    []string{"foo"},
+			Manager:     &TestManager{},
+			Interactive: false,
+		},
+		Expected: func(t *testing.T, vars []*types.BuildVars) {
+			assert.Equal(t, 1, len(vars))
+			assert.Equal(t, vars[0].Name, "foo")
+			assert.Equal(t, vars[0].Description, "Foo package")
+		},
+	}} {
+		t.Run(tc.Name, func(t *testing.T) {
+			cfg := &TestConfig{}
+			pf := &TestPackageFinder{}
+			info := &distro.OSRelease{}
+
+			ctx := context.Background()
+
+			b := NewBuilder(
+				ctx,
+				tc.Opts,
+				pf,
+				info,
+				cfg,
+			)
+
+			fl, err := syntax.NewParser().Parse(strings.NewReader(tc.Script), "alr.sh")
+			assert.NoError(t, err)
+
+			_, allVars, err := b.executeFirstPass(fl)
+			assert.NoError(t, err)
+
+			tc.Expected(t, allVars)
 		})
 	}
 }

pkg/build/install.go

@@ -1,84 +0,0 @@
-// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
-// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
-//
-// 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 (
-	"context"
-	"log/slog"
-	"os"
-	"path/filepath"
-
-	"github.com/leonelquinteros/gotext"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
-)
-
-// InstallPkgs устанавливает нативные пакеты с использованием менеджера пакетов,
-// затем строит и устанавливает пакеты ALR
-func InstallPkgs(ctx context.Context, alrPkgs []db.Package, nativePkgs []string, opts types.BuildOpts) {
-	if len(nativePkgs) > 0 {
-		err := opts.Manager.Install(nil, nativePkgs...)
-		// Если есть нативные пакеты, выполняем их установку
-		if err != nil {
-			slog.Error(gotext.Get("Error installing native packages"), "err", err)
-			os.Exit(1)
-			// Логируем и завершаем выполнение при ошибке
-		}
-	}
-
-	InstallScripts(ctx, GetScriptPaths(ctx, alrPkgs), opts)
-	// Устанавливаем скрипты сборки через функцию InstallScripts
-}
-
-// GetScriptPaths возвращает срез путей к скриптам, соответствующий
-// данным пакетам
-func GetScriptPaths(ctx context.Context, pkgs []db.Package) []string {
-	var scripts []string
-	for _, pkg := range pkgs {
-		// Для каждого пакета создаем путь к скрипту сборки
-		scriptPath := filepath.Join(config.GetPaths(ctx).RepoDir, pkg.Repository, pkg.Name, "alr.sh")
-		scripts = append(scripts, scriptPath)
-	}
-	return scripts
-}
-
-// InstallScripts строит и устанавливает переданные alr скрипты сборки
-func InstallScripts(ctx context.Context, scripts []string, opts types.BuildOpts) {
-	for _, script := range scripts {
-		opts.Script = script // Устанавливаем текущий скрипт в опции
-		builtPkgs, _, err := BuildPackage(ctx, opts)
-		// Выполняем сборку пакета
-		if err != nil {
-			slog.Error(gotext.Get("Error building package"), "err", err)
-			os.Exit(1)
-			// Логируем и завершаем выполнение при ошибке сборки
-		}
-
-		err = opts.Manager.InstallLocal(nil, builtPkgs...)
-		// Устанавливаем локально собранные пакеты
-		if err != nil {
-			slog.Error(gotext.Get("Error installing package"), "err", err)
-			os.Exit(1)
-			// Логируем и завершаем выполнение при ошибке установки
-		}
-	}
-}

pkg/build/utils.go

@@ -0,0 +1,336 @@
+// 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 (
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"regexp"
+	"runtime"
+	"slices"
+	"strconv"
+	"strings"
+
+	// Импортируем пакеты для поддержки различных форматов пакетов (APK, DEB, RPM и ARCH).
+
+	_ "github.com/goreleaser/nfpm/v2/apk"
+	_ "github.com/goreleaser/nfpm/v2/arch"
+	_ "github.com/goreleaser/nfpm/v2/deb"
+	_ "github.com/goreleaser/nfpm/v2/rpm"
+	"mvdan.cc/sh/v3/syntax"
+
+	"github.com/goreleaser/nfpm/v2"
+	"github.com/goreleaser/nfpm/v2/files"
+
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
+	"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"
+)
+
+// Функция readScript анализирует скрипт сборки с использованием встроенной реализации bash
+func readScript(script string) (*syntax.File, error) {
+	fl, err := os.Open(script) // Открываем файл скрипта
+	if err != nil {
+		return nil, err
+	}
+	defer fl.Close() // Закрываем файл после выполнения
+
+	file, err := syntax.NewParser().Parse(fl, "alr.sh") // Парсим скрипт с помощью синтаксического анализатора
+	if err != nil {
+		return nil, err
+	}
+
+	return file, nil // Возвращаем синтаксическое дерево
+}
+
+// Функция prepareDirs подготавливает директории для сборки.
+func prepareDirs(dirs types.Directories) error {
+	err := os.RemoveAll(dirs.BaseDir) // Удаляем базовую директорию, если она существует
+	if err != nil {
+		return err
+	}
+	err = os.MkdirAll(dirs.SrcDir, 0o755) // Создаем директорию для источников
+	if err != nil {
+		return err
+	}
+	return os.MkdirAll(dirs.PkgDir, 0o755) // Создаем директорию для пакетов
+}
+
+// Функция buildContents создает секцию содержимого пакета, которая содержит файлы,
+// которые будут включены в конечный пакет.
+func buildContents(vars *types.BuildVars, dirs types.Directories, preferedContents *[]string) ([]*files.Content, error) {
+	contents := []*files.Content{}
+
+	processPath := func(path, trimmed string, prefered bool) error {
+		fi, err := os.Lstat(path)
+		if err != nil {
+			return err
+		}
+
+		if fi.IsDir() {
+			f, err := os.Open(path)
+			if err != nil {
+				return err
+			}
+			defer f.Close()
+
+			if !prefered {
+				_, err = f.Readdirnames(1)
+				if err != io.EOF {
+					return nil
+				}
+			}
+
+			contents = append(contents, &files.Content{
+				Source:      path,
+				Destination: trimmed,
+				Type:        "dir",
+				FileInfo: &files.ContentFileInfo{
+					MTime: fi.ModTime(),
+				},
+			})
+			return nil
+		}
+
+		if fi.Mode()&os.ModeSymlink != 0 {
+			link, err := os.Readlink(path)
+			if err != nil {
+				return err
+			}
+			link = strings.TrimPrefix(link, dirs.PkgDir)
+
+			contents = append(contents, &files.Content{
+				Source:      link,
+				Destination: trimmed,
+				Type:        "symlink",
+				FileInfo: &files.ContentFileInfo{
+					MTime: fi.ModTime(),
+					Mode:  fi.Mode(),
+				},
+			})
+			return nil
+		}
+
+		fileContent := &files.Content{
+			Source:      path,
+			Destination: trimmed,
+			FileInfo: &files.ContentFileInfo{
+				MTime: fi.ModTime(),
+				Mode:  fi.Mode(),
+				Size:  fi.Size(),
+			},
+		}
+
+		if slices.Contains(vars.Backup, trimmed) {
+			fileContent.Type = "config|noreplace"
+		}
+
+		contents = append(contents, fileContent)
+		return nil
+	}
+
+	if preferedContents != nil {
+		for _, trimmed := range *preferedContents {
+			path := filepath.Join(dirs.PkgDir, trimmed)
+			if err := processPath(path, trimmed, true); err != nil {
+				return nil, err
+			}
+		}
+	} else {
+		err := filepath.Walk(dirs.PkgDir, func(path string, fi os.FileInfo, err error) error {
+			if err != nil {
+				return err
+			}
+			trimmed := strings.TrimPrefix(path, dirs.PkgDir)
+			return processPath(path, trimmed, false)
+		})
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return contents, nil
+}
+
+var RegexpALRPackageName = regexp.MustCompile(`^(?P<package>[^+]+)\+alr-(?P<repo>.+)$`)
+
+func getBasePkgInfo(vars *types.BuildVars, info *distro.OSRelease, opts *types.BuildOpts) *nfpm.Info {
+	return &nfpm.Info{
+		Name:    fmt.Sprintf("%s+alr-%s", vars.Name, opts.Repository),
+		Arch:    cpu.Arch(),
+		Version: vars.Version,
+		Release: overrides.ReleasePlatformSpecific(vars.Release, info),
+		Epoch:   strconv.FormatUint(uint64(vars.Epoch), 10),
+	}
+}
+
+// Функция getPkgFormat возвращает формат пакета из менеджера пакетов,
+// или ALR_PKG_FORMAT, если он установлен.
+func getPkgFormat(mgr manager.Manager) string {
+	pkgFormat := mgr.Format()
+	if format, ok := os.LookupEnv("ALR_PKG_FORMAT"); ok {
+		pkgFormat = format
+	}
+	return pkgFormat
+}
+
+// Функция createBuildEnvVars создает переменные окружения, которые будут установлены
+// в скрипте сборки при его выполнении.
+func createBuildEnvVars(info *distro.OSRelease, dirs types.Directories) []string {
+	env := os.Environ()
+
+	env = append(
+		env,
+		"DISTRO_NAME="+info.Name,
+		"DISTRO_PRETTY_NAME="+info.PrettyName,
+		"DISTRO_ID="+info.ID,
+		"DISTRO_VERSION_ID="+info.VersionID,
+		"DISTRO_ID_LIKE="+strings.Join(info.Like, " "),
+		"ARCH="+cpu.Arch(),
+		"NCPU="+strconv.Itoa(runtime.NumCPU()),
+	)
+
+	if dirs.ScriptDir != "" {
+		env = append(env, "scriptdir="+dirs.ScriptDir)
+	}
+
+	if dirs.PkgDir != "" {
+		env = append(env, "pkgdir="+dirs.PkgDir)
+	}
+
+	if dirs.SrcDir != "" {
+		env = append(env, "srcdir="+dirs.SrcDir)
+	}
+
+	return env
+}
+
+// Функция setScripts добавляет скрипты-перехватчики к метаданным пакета.
+func setScripts(vars *types.BuildVars, info *nfpm.Info, scriptDir string) {
+	if vars.Scripts.PreInstall != "" {
+		info.Scripts.PreInstall = filepath.Join(scriptDir, vars.Scripts.PreInstall)
+	}
+
+	if vars.Scripts.PostInstall != "" {
+		info.Scripts.PostInstall = filepath.Join(scriptDir, vars.Scripts.PostInstall)
+	}
+
+	if vars.Scripts.PreRemove != "" {
+		info.Scripts.PreRemove = filepath.Join(scriptDir, vars.Scripts.PreRemove)
+	}
+
+	if vars.Scripts.PostRemove != "" {
+		info.Scripts.PostRemove = filepath.Join(scriptDir, vars.Scripts.PostRemove)
+	}
+
+	if vars.Scripts.PreUpgrade != "" {
+		info.ArchLinux.Scripts.PreUpgrade = filepath.Join(scriptDir, vars.Scripts.PreUpgrade)
+		info.APK.Scripts.PreUpgrade = filepath.Join(scriptDir, vars.Scripts.PreUpgrade)
+	}
+
+	if vars.Scripts.PostUpgrade != "" {
+		info.ArchLinux.Scripts.PostUpgrade = filepath.Join(scriptDir, vars.Scripts.PostUpgrade)
+		info.APK.Scripts.PostUpgrade = filepath.Join(scriptDir, vars.Scripts.PostUpgrade)
+	}
+
+	if vars.Scripts.PreTrans != "" {
+		info.RPM.Scripts.PreTrans = filepath.Join(scriptDir, vars.Scripts.PreTrans)
+	}
+
+	if vars.Scripts.PostTrans != "" {
+		info.RPM.Scripts.PostTrans = filepath.Join(scriptDir, vars.Scripts.PostTrans)
+	}
+}
+
+/*
+// Функция setVersion изменяет переменную версии в скрипте runner.
+// Она используется для установки версии на вывод функции version().
+func setVersion(ctx context.Context, r *interp.Runner, to string) error {
+	fl, err := syntax.NewParser().Parse(strings.NewReader("version='"+to+"'"), "")
+	if err != nil {
+		return err
+	}
+	return r.Run(ctx, fl)
+}
+*/
+// Returns not installed dependencies
+func removeAlreadyInstalled(opts types.BuildOpts, dependencies []string) ([]string, error) {
+	filteredPackages := []string{}
+
+	for _, dep := range dependencies {
+		installed, err := opts.Manager.IsInstalled(dep)
+		if err != nil {
+			return nil, err
+		}
+		if installed {
+			continue
+		}
+		filteredPackages = append(filteredPackages, dep)
+	}
+
+	return filteredPackages, nil
+}
+
+// Функция packageNames возвращает имена всех предоставленных пакетов.
+func packageNames(pkgs []db.Package) []string {
+	names := make([]string, len(pkgs))
+	for i, p := range pkgs {
+		names[i] = p.Name
+	}
+	return names
+}
+
+// Функция removeDuplicates убирает любые дубликаты из предоставленного среза.
+func removeDuplicates(slice []string) []string {
+	seen := map[string]struct{}{}
+	result := []string{}
+
+	for _, s := range slice {
+		if _, ok := seen[s]; !ok {
+			seen[s] = struct{}{}
+			result = append(result, s)
+		}
+	}
+
+	return result
+}
+
+func removeDuplicatesSources(sources, checksums []string) ([]string, []string) {
+	seen := map[string]string{}
+	keys := make([]string, 0)
+	for i, s := range sources {
+		if val, ok := seen[s]; !ok || strings.EqualFold(val, "SKIP") {
+			if !ok {
+				keys = append(keys, s)
+			}
+			seen[s] = checksums[i]
+		}
+	}
+
+	newSources := make([]string, len(keys))
+	newChecksums := make([]string, len(keys))
+	for i, k := range keys {
+		newSources[i] = k
+		newChecksums[i] = seen[k]
+	}
+	return newSources, newChecksums
+}

pkg/build/utils_internal_test.go

@@ -0,0 +1,47 @@
+// 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 (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestRemoveDuplicatesSources(t *testing.T) {
+	type testCase struct {
+		Name         string
+		Sources      []string
+		Checksums    []string
+		NewSources   []string
+		NewChecksums []string
+	}
+
+	for _, tc := range []testCase{{
+		Name:         "prefer non-skip values",
+		Sources:      []string{"a", "b", "c", "a"},
+		Checksums:    []string{"skip", "skip", "skip", "1"},
+		NewSources:   []string{"a", "b", "c"},
+		NewChecksums: []string{"1", "skip", "skip"},
+	}} {
+		t.Run(tc.Name, func(t *testing.T) {
+			s, c := removeDuplicatesSources(tc.Sources, tc.Checksums)
+			assert.Equal(t, s, tc.NewSources)
+			assert.Equal(t, c, tc.NewChecksums)
+		})
+	}
+}

pkg/distro/osrelease.go

@@ -79,7 +79,7 @@ func ParseOSRelease(ctx context.Context) (*OSRelease, error) {
 	runner, err := interp.New(
 		interp.OpenHandler(handlers.NopOpen),
 		interp.ExecHandler(handlers.NopExec),
-		interp.ReadDirHandler(handlers.NopReadDir),
+		interp.ReadDirHandler2(handlers.NopReadDir),
 		interp.StatHandler(handlers.NopStat),
 		interp.Env(expand.ListEnviron()),
 	)

pkg/gen/tmpls/pip.tmpl.sh

@@ -32,19 +32,19 @@ deps=("python3")
 deps_arch=("python")
 deps_alpine=("python3")
 
-build_deps=("python3" "python3-setuptools")
-build_deps_arch=("python" "python-setuptools")
-build_deps_alpine=("python3" "py3-setuptools")
+build_deps=("python3" "python3-pip")
+build_deps_arch=("python" "python-pip")
+build_deps_alpine=("python3" "py3-pip")
 
 sources=("https://files.pythonhosted.org/packages/source/{{.SourceURL.Filename | firstchar}}/{{.Info.Name}}/{{.SourceURL.Filename}}")
 checksums=('blake2b-256:{{.SourceURL.Digests.blake2b_256}}')
 
 build() {
 	cd "$srcdir/{{.Info.Name}}-${version}"
-	python3 setup.py build
+  python3 -m build
 }
 
 package() {
 	cd "$srcdir/{{.Info.Name}}-${version}"
-	python3 setup.py install --root="${pkgdir}/" --optimize=1 || return 1
+	pip install --root="${pkgdir}/" . --no-deps --disable-pip-version-check
 }

pkg/repos/pull.go

@@ -22,6 +22,8 @@ package repos
 import (
 	"context"
 	"errors"
+	"fmt"
+	"io"
 	"log/slog"
 	"net/url"
 	"os"
@@ -41,8 +43,10 @@ import (
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 )
 
 type actionType uint8
@@ -63,7 +67,7 @@ type action struct {
 // If repos is set to nil, the repos in the ALR config will be used.
 func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error {
 	if repos == nil {
-		repos = rs.cfg.Repos(ctx)
+		repos = rs.cfg.Repos()
 	}
 
 	for _, repo := range repos {
@@ -73,7 +77,7 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error {
 		}
 
 		slog.Info(gotext.Get("Pulling repository"), "name", repo.Name)
-		repoDir := filepath.Join(config.GetPaths(ctx).RepoDir, repo.Name)
+		repoDir := filepath.Join(rs.cfg.GetPaths().RepoDir, repo.Name)
 
 		var repoFS billy.Filesystem
 		gitDir := filepath.Join(repoDir, ".git")
@@ -177,6 +181,96 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error {
 	return nil
 }
 
+func (rs *Repos) updatePkg(ctx context.Context, repo types.Repo, runner *interp.Runner, scriptFl io.ReadCloser) error {
+	parser := syntax.NewParser()
+
+	defer scriptFl.Close()
+	fl, err := parser.Parse(scriptFl, "alr.sh")
+	if err != nil {
+		return err
+	}
+
+	runner.Reset()
+	err = runner.Run(ctx, fl)
+	if err != nil {
+		return err
+	}
+
+	type packages struct {
+		BasePkgName string   `sh:"basepkg_name"`
+		Names       []string `sh:"name"`
+	}
+
+	var pkgs packages
+
+	d := decoder.New(&distro.OSRelease{}, runner)
+	d.Overrides = false
+	d.LikeDistros = false
+	err = d.DecodeVars(&pkgs)
+	if err != nil {
+		return err
+	}
+
+	if len(pkgs.Names) > 1 {
+		if pkgs.BasePkgName == "" {
+			pkgs.BasePkgName = pkgs.Names[0]
+		}
+		for _, pkgName := range pkgs.Names {
+			pkgInfo := PackageInfo{}
+			funcName := fmt.Sprintf("meta_%s", pkgName)
+			runner.Reset()
+			err = runner.Run(ctx, fl)
+			if err != nil {
+				return err
+			}
+			meta, ok := d.GetFuncWithSubshell(funcName)
+			if !ok {
+				return errors.New("func is missing")
+			}
+			r, err := meta(ctx)
+			if err != nil {
+				return err
+			}
+			d := decoder.New(&distro.OSRelease{}, r)
+			d.Overrides = false
+			d.LikeDistros = false
+			err = d.DecodeVars(&pkgInfo)
+			if err != nil {
+				return err
+			}
+			pkg := pkgInfo.ToPackage(repo.Name)
+			resolveOverrides(r, pkg)
+			pkg.Name = pkgName
+			pkg.BasePkgName = pkgs.BasePkgName
+			err = rs.db.InsertPackage(ctx, *pkg)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}
+
+	pkg := EmptyPackage(repo.Name)
+	err = d.DecodeVars(pkg)
+	if err != nil {
+		return err
+	}
+	resolveOverrides(runner, pkg)
+	return rs.db.InsertPackage(ctx, *pkg)
+}
+
+func (rs *Repos) processRepoChangesRunner(repoDir, scriptDir string) (*interp.Runner, error) {
+	env := append(os.Environ(), "scriptdir="+scriptDir)
+	return interp.New(
+		interp.Env(expand.ListEnviron(env...)),
+		interp.ExecHandler(handlers.NopExec),
+		interp.ReadDirHandler2(handlers.RestrictedReadDir(repoDir)),
+		interp.StatHandler(handlers.RestrictedStat(repoDir)),
+		interp.OpenHandler(handlers.RestrictedOpen(repoDir)),
+		interp.StdIO(handlers.NopRWC{}, handlers.NopRWC{}, handlers.NopRWC{}),
+	)
+}
+
 func (rs *Repos) processRepoChanges(ctx context.Context, repo types.Repo, r *git.Repository, w *git.Worktree, old, new *plumbing.Reference) error {
 	oldCommit, err := r.CommitObject(old.Hash())
 	if err != nil {
@@ -235,15 +329,7 @@ func (rs *Repos) processRepoChanges(ctx context.Context, repo types.Repo, r *git
 	parser := syntax.NewParser()
 
 	for _, action := range actions {
-		env := append(os.Environ(), "scriptdir="+filepath.Dir(filepath.Join(repoDir, action.File)))
-		runner, err := interp.New(
-			interp.Env(expand.ListEnviron(env...)),
-			interp.ExecHandler(handlers.NopExec),
-			interp.ReadDirHandler(handlers.RestrictedReadDir(repoDir)),
-			interp.StatHandler(handlers.RestrictedStat(repoDir)),
-			interp.OpenHandler(handlers.RestrictedOpen(repoDir)),
-			interp.StdIO(handlers.NopRWC{}, handlers.NopRWC{}, handlers.NopRWC{}),
-		)
+		runner, err := rs.processRepoChangesRunner(repoDir, filepath.Dir(filepath.Join(repoDir, action.File)))
 		if err != nil {
 			return err
 		}
@@ -289,23 +375,7 @@ func (rs *Repos) processRepoChanges(ctx context.Context, repo types.Repo, r *git
 				return nil
 			}
 
-			pkg := db.Package{
-				Description:  db.NewJSON(map[string]string{}),
-				Homepage:     db.NewJSON(map[string]string{}),
-				Maintainer:   db.NewJSON(map[string]string{}),
-				Depends:      db.NewJSON(map[string][]string{}),
-				BuildDepends: db.NewJSON(map[string][]string{}),
-				Repository:   repo.Name,
-			}
-
-			err = parseScript(ctx, parser, runner, r, &pkg)
-			if err != nil {
-				return err
-			}
-
-			resolveOverrides(runner, &pkg)
-
-			err = rs.db.InsertPackage(ctx, pkg)
+			err = rs.updatePkg(ctx, repo, runner, r)
 			if err != nil {
 				return err
 			}
@@ -322,18 +392,8 @@ func (rs *Repos) processRepoFull(ctx context.Context, repo types.Repo, repoDir s
 		return err
 	}
 
-	parser := syntax.NewParser()
-
 	for _, match := range matches {
-		env := append(os.Environ(), "scriptdir="+filepath.Dir(match))
-		runner, err := interp.New(
-			interp.Env(expand.ListEnviron(env...)),
-			interp.ExecHandler(handlers.NopExec),
-			interp.ReadDirHandler(handlers.RestrictedReadDir(repoDir)),
-			interp.StatHandler(handlers.RestrictedStat(repoDir)),
-			interp.OpenHandler(handlers.RestrictedOpen(repoDir)),
-			interp.StdIO(handlers.NopRWC{}, handlers.NopRWC{}, handlers.NopRWC{}),
-		)
+		runner, err := rs.processRepoChangesRunner(repoDir, filepath.Dir(match))
 		if err != nil {
 			return err
 		}
@@ -343,23 +403,7 @@ func (rs *Repos) processRepoFull(ctx context.Context, repo types.Repo, repoDir s
 			return err
 		}
 
-		pkg := db.Package{
-			Description:  db.NewJSON(map[string]string{}),
-			Homepage:     db.NewJSON(map[string]string{}),
-			Maintainer:   db.NewJSON(map[string]string{}),
-			Depends:      db.NewJSON(map[string][]string{}),
-			BuildDepends: db.NewJSON(map[string][]string{}),
-			Repository:   repo.Name,
-		}
-
-		err = parseScript(ctx, parser, runner, scriptFl, &pkg)
-		if err != nil {
-			return err
-		}
-
-		resolveOverrides(runner, &pkg)
-
-		err = rs.db.InsertPackage(ctx, pkg)
+		err = rs.updatePkg(ctx, repo, runner, scriptFl)
 		if err != nil {
 			return err
 		}

pkg/repos/pull_internal_test.go

@@ -0,0 +1,173 @@
+// 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 repos
+
+import (
+	"context"
+	"io"
+	"os"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
+)
+
+type TestALRConfig struct{}
+
+func (c *TestALRConfig) GetPaths() *config.Paths {
+	return &config.Paths{
+		DBPath: ":memory:",
+	}
+}
+
+func (c *TestALRConfig) Repos() []types.Repo {
+	return []types.Repo{
+		{
+			Name: "test",
+			URL:  "https://test",
+		},
+	}
+}
+
+func createReadCloserFromString(input string) io.ReadCloser {
+	reader := strings.NewReader(input)
+	return struct {
+		io.Reader
+		io.Closer
+	}{
+		Reader: reader,
+		Closer: io.NopCloser(reader),
+	}
+}
+
+func TestUpdatePkg(t *testing.T) {
+	type testCase struct {
+		name   string
+		file   string
+		verify func(context.Context, *db.Database)
+	}
+
+	repo := types.Repo{
+		Name: "test",
+		URL:  "https://test",
+	}
+
+	for _, tc := range []testCase{
+		{
+			name: "single package",
+			file: `name=foo
+version='0.0.1'
+release=1
+desc="main desc"
+deps=('sudo')
+build_deps=('golang')
+`,
+			verify: func(ctx context.Context, database *db.Database) {
+				result, err := database.GetPkgs(ctx, "1 = 1")
+				assert.NoError(t, err)
+				pkgCount := 0
+				for result.Next() {
+					var dbPkg db.Package
+					err = result.StructScan(&dbPkg)
+					if err != nil {
+						t.Errorf("Expected no error, got %s", err)
+					}
+
+					assert.Equal(t, "foo", dbPkg.Name)
+					assert.Equal(t, db.NewJSON(map[string]string{"": "main desc"}), dbPkg.Description)
+					assert.Equal(t, db.NewJSON(map[string][]string{"": {"sudo"}}), dbPkg.Depends)
+					pkgCount++
+				}
+				assert.Equal(t, 1, pkgCount)
+			},
+		},
+		{
+			name: "multiple package",
+			file: `basepkg_name=foo
+name=(
+	bar
+	buz
+)
+version='0.0.1'
+release=1
+desc="main desc"
+deps=('sudo')
+build_deps=('golang')
+		
+meta_bar() {
+	desc="foo desc"
+}
+			
+meta_buz() {
+	deps+=('doas')
+}
+`,
+			verify: func(ctx context.Context, database *db.Database) {
+				result, err := database.GetPkgs(ctx, "1 = 1")
+				assert.NoError(t, err)
+
+				pkgCount := 0
+				for result.Next() {
+					var dbPkg db.Package
+					err = result.StructScan(&dbPkg)
+					if err != nil {
+						t.Errorf("Expected no error, got %s", err)
+					}
+					if dbPkg.Name == "bar" {
+						assert.Equal(t, db.NewJSON(map[string]string{"": "foo desc"}), dbPkg.Description)
+						assert.Equal(t, db.NewJSON(map[string][]string{"": {"sudo"}}), dbPkg.Depends)
+					}
+
+					if dbPkg.Name == "buz" {
+						assert.Equal(t, db.NewJSON(map[string]string{"": "main desc"}), dbPkg.Description)
+						assert.Equal(t, db.NewJSON(map[string][]string{"": {"sudo", "doas"}}), dbPkg.Depends)
+					}
+					pkgCount++
+				}
+				assert.Equal(t, 2, pkgCount)
+			},
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			cfg := &TestALRConfig{}
+			ctx := context.Background()
+
+			database := db.New(&TestALRConfig{})
+			database.Init(ctx)
+
+			rs := New(cfg, database)
+
+			path, err := os.MkdirTemp("", "test-update-pkg")
+			assert.NoError(t, err)
+			defer os.RemoveAll(path)
+
+			runner, err := rs.processRepoChangesRunner(path, path)
+			assert.NoError(t, err)
+
+			err = rs.updatePkg(ctx, repo, runner, createReadCloserFromString(
+				tc.file,
+			))
+			assert.NoError(t, err)
+
+			tc.verify(ctx, database)
+		})
+	}
+}

pkg/repos/pull_test.go

@@ -44,7 +44,7 @@ type TestALRConfig struct {
 	PkgsDir  string
 }
 
-func (c *TestALRConfig) GetPaths(ctx context.Context) *config.Paths {
+func (c *TestALRConfig) GetPaths() *config.Paths {
 	return &config.Paths{
 		DBPath:   ":memory:",
 		CacheDir: c.CacheDir,
@@ -53,7 +53,7 @@ func (c *TestALRConfig) GetPaths(ctx context.Context) *config.Paths {
 	}
 }
 
-func (c *TestALRConfig) Repos(ctx context.Context) []types.Repo {
+func (c *TestALRConfig) Repos() []types.Repo {
 	return []types.Repo{}
 }
 

pkg/repos/repos.go

@@ -17,16 +17,14 @@
 package repos
 
 import (
-	"context"
-
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
 	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 )
 
 type Config interface {
-	GetPaths(ctx context.Context) *config.Paths
-	Repos(ctx context.Context) []types.Repo
+	GetPaths() *config.Paths
+	Repos() []types.Repo
 }
 
 type Repos struct {

pkg/repos/repos_legacy.go

@@ -1,70 +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 repos
-
-import (
-	"context"
-	"sync"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
-	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
-)
-
-// Pull pulls the provided repositories. If a repo doesn't exist, it will be cloned
-// and its packages will be written to the DB. If it does exist, it will be pulled.
-// In this case, only changed packages will be processed if possible.
-// If repos is set to nil, the repos in the ALR config will be used.
-//
-// Deprecated: use struct method
-func Pull(ctx context.Context, repos []types.Repo) error {
-	return GetInstance(ctx).Pull(ctx, repos)
-}
-
-// FindPkgs looks for packages matching the inputs inside the database.
-// It returns a map that maps the package name input to any packages found for it.
-// It also returns a slice that contains the names of all packages that were not found.
-//
-// Deprecated: use struct method
-func FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error) {
-	return GetInstance(ctx).FindPkgs(ctx, pkgs)
-}
-
-// =======================
-// FOR LEGACY ONLY
-// =======================
-
-var (
-	reposInstance *Repos
-	alrConfigOnce sync.Once
-)
-
-// Deprecated: For legacy only
-func GetInstance(ctx context.Context) *Repos {
-	alrConfigOnce.Do(func() {
-		cfg := config.GetInstance(ctx)
-		db := database.GetInstance(ctx)
-
-		reposInstance = New(
-			cfg,
-			db,
-		)
-	})
-
-	return reposInstance
-}

pkg/repos/utils.go

@@ -67,6 +67,47 @@ func parseScript(ctx context.Context, parser *syntax.Parser, runner *interp.Runn
 	return d.DecodeVars(pkg)
 }
 
+type PackageInfo struct {
+	Version       string            `sh:"version,required"`
+	Release       int               `sh:"release,required"`
+	Epoch         uint              `sh:"epoch"`
+	Architectures db.JSON[[]string] `sh:"architectures"`
+	Licenses      db.JSON[[]string] `sh:"license"`
+	Provides      db.JSON[[]string] `sh:"provides"`
+	Conflicts     db.JSON[[]string] `sh:"conflicts"`
+	Replaces      db.JSON[[]string] `sh:"replaces"`
+}
+
+func (inf *PackageInfo) ToPackage(repoName string) *db.Package {
+	return &db.Package{
+		Version:       inf.Version,
+		Release:       inf.Release,
+		Epoch:         inf.Epoch,
+		Architectures: inf.Architectures,
+		Licenses:      inf.Licenses,
+		Provides:      inf.Provides,
+		Conflicts:     inf.Conflicts,
+		Replaces:      inf.Replaces,
+		Description:   db.NewJSON(map[string]string{}),
+		Homepage:      db.NewJSON(map[string]string{}),
+		Maintainer:    db.NewJSON(map[string]string{}),
+		Depends:       db.NewJSON(map[string][]string{}),
+		BuildDepends:  db.NewJSON(map[string][]string{}),
+		Repository:    repoName,
+	}
+}
+
+func EmptyPackage(repoName string) *db.Package {
+	return &db.Package{
+		Description:  db.NewJSON(map[string]string{}),
+		Homepage:     db.NewJSON(map[string]string{}),
+		Maintainer:   db.NewJSON(map[string]string{}),
+		Depends:      db.NewJSON(map[string][]string{}),
+		BuildDepends: db.NewJSON(map[string][]string{}),
+		Repository:   repoName,
+	}
+}
+
 var overridable = map[string]string{
 	"deps":       "Depends",
 	"build_deps": "BuildDepends",

pkg/search/search.go

@@ -21,166 +21,46 @@ package search
 
 import (
 	"context"
-	"errors"
-	"io"
-	"io/fs"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"github.com/jmoiron/sqlx"
+
+	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 )
 
-// Filter represents search filters.
-type Filter int
-
-// Filters
-const (
-	FilterNone Filter = iota
-	FilterInRepo
-	FilterSupportsArch
-)
-
-// SoryBy represents a value that packages can be sorted by.
-type SortBy int
-
-// Sort values
-const (
-	SortByNone = iota
-	SortByName
-	SortByRepo
-	SortByVersion
-)
-
-// Package represents a package from ALR's database
-type Package struct {
-	Name          string
-	Version       string
-	Release       int
-	Epoch         uint
-	Description   map[string]string
-	Homepage      map[string]string
-	Maintainer    map[string]string
-	Architectures []string
-	Licenses      []string
-	Provides      []string
-	Conflicts     []string
-	Replaces      []string
-	Depends       map[string][]string
-	BuildDepends  map[string][]string
-	OptDepends    map[string][]string
-	Repository    string
+type PackagesProvider interface {
+	GetPkgs(ctx context.Context, where string, args ...any) (*sqlx.Rows, error)
 }
 
-func convertPkg(p db.Package) Package {
-	return Package{
-		Name:          p.Name,
-		Version:       p.Version,
-		Release:       p.Release,
-		Epoch:         p.Epoch,
-		Description:   p.Description.Val,
-		Homepage:      p.Homepage.Val,
-		Maintainer:    p.Maintainer.Val,
-		Architectures: p.Architectures.Val,
-		Licenses:      p.Licenses.Val,
-		Provides:      p.Provides.Val,
-		Conflicts:     p.Conflicts.Val,
-		Replaces:      p.Replaces.Val,
-		Depends:       p.Depends.Val,
-		BuildDepends:  p.BuildDepends.Val,
-		OptDepends:    p.OptDepends.Val,
-		Repository:    p.Repository,
+type Searcher struct {
+	pp PackagesProvider
+}
+
+func New(pp PackagesProvider) *Searcher {
+	return &Searcher{
+		pp: pp,
 	}
 }
 
-// Options contains the options for a search.
-type Options struct {
-	Filter      Filter
-	FilterValue string
-	SortBy      SortBy
-	Limit       int64
-	Query       string
-}
+func (s *Searcher) Search(
+	ctx context.Context,
+	opts *SearchOptions,
+) ([]database.Package, error) {
+	var packages []database.Package
 
-// Search searches for packages in the database based on the given options.
-func Search(ctx context.Context, opts Options) ([]Package, error) {
-	query := "(name LIKE ? OR description LIKE ? OR json_array_contains(provides, ?))"
-	args := []any{"%" + opts.Query + "%", "%" + opts.Query + "%", opts.Query}
-
-	if opts.Filter != FilterNone {
-		switch opts.Filter {
-		case FilterInRepo:
-			query += " AND repository = ?"
-		case FilterSupportsArch:
-			query += " AND json_array_contains(architectures, ?)"
-		}
-		args = append(args, opts.FilterValue)
-	}
-
-	if opts.SortBy != SortByNone {
-		switch opts.SortBy {
-		case SortByName:
-			query += " ORDER BY name"
-		case SortByRepo:
-			query += " ORDER BY repository"
-		case SortByVersion:
-			query += " ORDER BY version"
-		}
-	}
-
-	if opts.Limit != 0 {
-		query += " LIMIT " + strconv.FormatInt(opts.Limit, 10)
-	}
-
-	result, err := db.GetPkgs(ctx, query, args...)
+	where, args := opts.WhereClause()
+	result, err := s.pp.GetPkgs(ctx, where, args...)
 	if err != nil {
 		return nil, err
 	}
 
-	var out []Package
 	for result.Next() {
-		pkg := db.Package{}
-		err = result.StructScan(&pkg)
+		var dbPkg database.Package
+		err = result.StructScan(&dbPkg)
 		if err != nil {
 			return nil, err
 		}
-		out = append(out, convertPkg(pkg))
+		packages = append(packages, dbPkg)
 	}
 
-	return out, err
-}
-
-// GetPkg gets a single package from the database and returns it.
-func GetPkg(ctx context.Context, repo, name string) (Package, error) {
-	pkg, err := db.GetPkg(ctx, "name = ? AND repository = ?", name, repo)
-	return convertPkg(*pkg), err
-}
-
-var (
-	// ErrInvalidArgument is an error returned by GetScript when one of its arguments
-	// contain invalid characters
-	ErrInvalidArgument = errors.New("name and repository must not contain . or /")
-
-	// ErrScriptNotFound is returned by GetScript if it can't find the script requested
-	// by the user.
-	ErrScriptNotFound = errors.New("requested script not found")
-)
-
-// GetScript returns a reader containing the build script for a given package.
-func GetScript(ctx context.Context, repo, name string) (io.ReadCloser, error) {
-	if strings.Contains(name, "./") || strings.ContainsAny(repo, "./") {
-		return nil, ErrInvalidArgument
-	}
-
-	scriptPath := filepath.Join(config.GetPaths(ctx).RepoDir, repo, name, "alr.sh")
-	fl, err := os.Open(scriptPath)
-	if errors.Is(err, fs.ErrNotExist) {
-		return nil, ErrScriptNotFound
-	} else if err != nil {
-		return nil, err
-	}
-
-	return fl, nil
+	return packages, nil
 }

pkg/search/search_options_builder.go

@@ -0,0 +1,86 @@
+// 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 search
+
+import (
+	"fmt"
+	"strings"
+)
+
+type SearchOptions struct {
+	conditions []string
+	args       []any
+}
+
+func (o *SearchOptions) WhereClause() (string, []any) {
+	if len(o.conditions) == 0 {
+		return "", nil
+	}
+	return strings.Join(o.conditions, " AND "), o.args
+}
+
+type SearchOptionsBuilder struct {
+	options SearchOptions
+}
+
+func NewSearchOptions() *SearchOptionsBuilder {
+	return &SearchOptionsBuilder{}
+}
+
+func (b *SearchOptionsBuilder) withGeneralLike(key, value string) *SearchOptionsBuilder {
+	if value != "" {
+		b.options.conditions = append(b.options.conditions, fmt.Sprintf("%s LIKE ?", key))
+		b.options.args = append(b.options.args, "%"+value+"%")
+	}
+	return b
+}
+
+func (b *SearchOptionsBuilder) withGeneralEqual(key string, value any) *SearchOptionsBuilder {
+	if value != "" {
+		b.options.conditions = append(b.options.conditions, fmt.Sprintf("%s = ?", key))
+		b.options.args = append(b.options.args, value)
+	}
+	return b
+}
+
+func (b *SearchOptionsBuilder) withGeneralJsonArrayContains(key string, value any) *SearchOptionsBuilder {
+	if value != "" {
+		b.options.conditions = append(b.options.conditions, fmt.Sprintf("json_array_contains(%s, ?)", key))
+		b.options.args = append(b.options.args, value)
+	}
+	return b
+}
+
+func (b *SearchOptionsBuilder) WithName(name string) *SearchOptionsBuilder {
+	return b.withGeneralLike("name", name)
+}
+
+func (b *SearchOptionsBuilder) WithDescription(description string) *SearchOptionsBuilder {
+	return b.withGeneralLike("description", description)
+}
+
+func (b *SearchOptionsBuilder) WithRepository(repository string) *SearchOptionsBuilder {
+	return b.withGeneralEqual("repository", repository)
+}
+
+func (b *SearchOptionsBuilder) WithProvides(provides string) *SearchOptionsBuilder {
+	return b.withGeneralJsonArrayContains("provides", provides)
+}
+
+func (b *SearchOptionsBuilder) Build() *SearchOptions {
+	return &b.options
+}

pkg/search/search_test.go

@@ -0,0 +1,65 @@
+// 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 search_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/search"
+)
+
+func TestSearhOptionsBuilder(t *testing.T) {
+	type testCase struct {
+		name          string
+		prepare       func() *search.SearchOptions
+		expectedWhere string
+		expectedArgs  []any
+	}
+
+	for _, tc := range []testCase{
+		{
+			name: "Empty fields",
+			prepare: func() *search.SearchOptions {
+				return search.NewSearchOptions().
+					Build()
+			},
+			expectedWhere: "",
+			expectedArgs:  []any{},
+		},
+		{
+			name: "All fields",
+			prepare: func() *search.SearchOptions {
+				return search.NewSearchOptions().
+					WithName("foo").
+					WithDescription("bar").
+					WithRepository("buz").
+					WithProvides("test").
+					Build()
+			},
+			expectedWhere: "name LIKE ? AND description LIKE ? AND repository = ? AND json_array_contains(provides, ?)",
+			expectedArgs:  []any{"%foo%", "%bar%", "buz", "test"},
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			whereClause, args := tc.prepare().WhereClause()
+			assert.Equal(t, tc.expectedWhere, whereClause)
+			assert.ElementsMatch(t, tc.expectedArgs, args)
+		})
+	}
+}

repo.go

@@ -25,12 +25,11 @@ import (
 	"path/filepath"
 
 	"github.com/leonelquinteros/gotext"
-	"github.com/pelletier/go-toml/v2"
 	"github.com/urfave/cli/v2"
 	"golang.org/x/exp/slices"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	database "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/repos"
 )
@@ -60,33 +59,42 @@ func AddRepoCmd() *cli.Command {
 			name := c.String("name")
 			repoURL := c.String("url")
 
-			cfg := config.Config(ctx)
+			cfg := config.New()
+			err := cfg.Load()
+			if err != nil {
+				slog.Error(gotext.Get("Error loading config"), "err", err)
+				os.Exit(1)
+			}
 
-			for _, repo := range cfg.Repos {
+			reposSlice := cfg.Repos()
+
+			for _, repo := range reposSlice {
 				if repo.URL == repoURL {
 					slog.Error("Repo already exists", "name", repo.Name)
 					os.Exit(1)
 				}
 			}
 
-			cfg.Repos = append(cfg.Repos, types.Repo{
+			reposSlice = append(reposSlice, types.Repo{
 				Name: name,
 				URL:  repoURL,
 			})
+			cfg.SetRepos(reposSlice)
 
-			cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath)
+			err = cfg.SaveUserConfig()
 			if err != nil {
-				slog.Error(gotext.Get("Error opening config file"), "err", err)
+				slog.Error(gotext.Get("Error saving config"), "err", err)
 				os.Exit(1)
 			}
 
-			err = toml.NewEncoder(cfgFl).Encode(cfg)
+			db := database.New(cfg)
+			err = db.Init(ctx)
 			if err != nil {
-				slog.Error(gotext.Get("Error encoding config"), "err", err)
-				os.Exit(1)
+				slog.Error(gotext.Get("Error pulling repos"), "err", err)
 			}
 
-			err = repos.Pull(ctx, cfg.Repos)
+			rs := repos.New(cfg, db)
+			err = rs.Pull(ctx, cfg.Repos())
 			if err != nil {
 				slog.Error(gotext.Get("Error pulling repos"), "err", err)
 				os.Exit(1)
@@ -114,11 +122,17 @@ func RemoveRepoCmd() *cli.Command {
 			ctx := c.Context
 
 			name := c.String("name")
-			cfg := config.Config(ctx)
+			cfg := config.New()
+			err := cfg.Load()
+			if err != nil {
+				slog.Error(gotext.Get("Error loading config"), "err", err)
+				os.Exit(1)
+			}
 
 			found := false
 			index := 0
-			for i, repo := range cfg.Repos {
+			reposSlice := cfg.Repos()
+			for i, repo := range reposSlice {
 				if repo.Name == name {
 					index = i
 					found = true
@@ -129,26 +143,25 @@ func RemoveRepoCmd() *cli.Command {
 				os.Exit(1)
 			}
 
-			cfg.Repos = slices.Delete(cfg.Repos, index, index+1)
+			cfg.SetRepos(slices.Delete(reposSlice, index, index+1))
 
-			cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath)
-			if err != nil {
-				slog.Error(gotext.Get("Error opening config file"), "err", err)
-				os.Exit(1)
-			}
-
-			err = toml.NewEncoder(cfgFl).Encode(&cfg)
-			if err != nil {
-				slog.Error(gotext.Get("Error encoding config"), "err", err)
-				os.Exit(1)
-			}
-
-			err = os.RemoveAll(filepath.Join(config.GetPaths(ctx).RepoDir, name))
+			err = os.RemoveAll(filepath.Join(cfg.GetPaths().RepoDir, name))
 			if err != nil {
 				slog.Error(gotext.Get("Error removing repo directory"), "err", err)
 				os.Exit(1)
 			}
 
+			err = cfg.SaveUserConfig()
+			if err != nil {
+				slog.Error(gotext.Get("Error saving config"), "err", err)
+				os.Exit(1)
+			}
+
+			db := database.New(cfg)
+			err = db.Init(ctx)
+			if err != nil {
+				os.Exit(1)
+			}
 			err = db.DeletePkgs(ctx, "repository = ?", name)
 			if err != nil {
 				slog.Error(gotext.Get("Error removing packages from database"), "err", err)
@@ -167,7 +180,20 @@ func RefreshCmd() *cli.Command {
 		Aliases: []string{"ref"},
 		Action: func(c *cli.Context) error {
 			ctx := c.Context
-			err := repos.Pull(ctx, config.Config(ctx).Repos)
+			cfg := config.New()
+			err := cfg.Load()
+			if err != nil {
+				slog.Error(gotext.Get("Error loading config"), "err", err)
+				os.Exit(1)
+			}
+
+			db := database.New(cfg)
+			err = db.Init(ctx)
+			if err != nil {
+				os.Exit(1)
+			}
+			rs := repos.New(cfg, db)
+			err = rs.Pull(ctx, cfg.Repos())
 			if err != nil {
 				slog.Error(gotext.Get("Error pulling repos"), "err", err)
 				os.Exit(1)

scripts/coverage-badge.sh

@@ -25,7 +25,7 @@ elif (( $(echo "$COVERAGE < 80" | bc -l) )); then
     COLOR="#dfb317"
 fi
 
-cat <<EOF > coverage-badge.svg
+cat <<EOF > assets/coverage-badge.svg
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="109" height="20">
     <linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
     <stop offset="1" stop-opacity=".1"/></linearGradient>

scripts/i18n-badge.sh

@@ -0,0 +1,84 @@
+#!/bin/bash
+# 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/>.
+
+
+TRANSLATIONS_DIR="internal/translations/po"
+
+if [ ! -d "$TRANSLATIONS_DIR" ]; then
+    echo "Error: directory '$TRANSLATIONS_DIR' not found"
+    exit 1
+fi
+
+declare -A TOTAL_STRINGS_MAP
+declare -A TRANSLATED_STRINGS_MAP
+
+for PO_FILE in $(find "$TRANSLATIONS_DIR" -type f -name "*.po"); do
+    LANG_DIR=$(dirname "$PO_FILE")
+    LANG=$(basename "$LANG_DIR")
+
+    STATS=$(LC_ALL=C msgfmt --statistics -o /dev/null "$PO_FILE" 2>&1)
+
+    NUMBERS=($(echo "$STATS" | grep -o '[0-9]\+'))
+
+    case ${#NUMBERS[@]} in
+        1) TRANSLATED_STRINGS=${NUMBERS[0]}; UNTRANSLATED_STRINGS=0 ;;  # all translated
+        2) TRANSLATED_STRINGS=${NUMBERS[0]}; UNTRANSLATED_STRINGS=${NUMBERS[1]} ;;  # no fuzzy
+        3) TRANSLATED_STRINGS=${NUMBERS[0]}; UNTRANSLATED_STRINGS=${NUMBERS[2]} ;;  # with fuzzy
+        *) TRANSLATED_STRINGS=0; UNTRANSLATED_STRINGS=0 ;; 
+    esac
+
+    TOTAL_STRINGS=$((TRANSLATED_STRINGS + UNTRANSLATED_STRINGS))
+
+    TOTAL_STRINGS_MAP[$LANG]=$((TOTAL_STRINGS_MAP[$LANG] + TOTAL_STRINGS))
+    TRANSLATED_STRINGS_MAP[$LANG]=$((TRANSLATED_STRINGS_MAP[$LANG] + TRANSLATED_STRINGS))
+done
+
+for LANG in "${!TOTAL_STRINGS_MAP[@]}"; do
+    TOTAL=${TOTAL_STRINGS_MAP[$LANG]}
+    TRANSLATED=${TRANSLATED_STRINGS_MAP[$LANG]}
+    if [ "$TOTAL" -eq 0 ]; then
+        PERCENTAGE="0.00"
+    else
+        PERCENTAGE=$(echo "scale=2; ($TRANSLATED / $TOTAL) * 100" | bc)
+    fi
+    COLOR="#4c1"
+    if (( $(echo "$PERCENTAGE < 50" | bc -l) )); then
+        COLOR="#e05d44"
+    elif (( $(echo "$PERCENTAGE < 80" | bc -l) )); then
+        COLOR="#dfb317"
+    fi
+cat <<EOF > assets/i18n-$LANG-badge.svg
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="129" height="20">
+    <linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+    <stop offset="1" stop-opacity=".1"/></linearGradient>
+    <mask id="round">
+        <rect width="129" height="20" rx="3" fill="#fff"/>
+    </mask>
+    <g mask="url(#round)">
+        <rect width="75" height="20" fill="#555"/>
+        <rect x="75" width="64" height="20" fill="${COLOR}"/>
+        <rect width="129" height="20" fill="url(#smooth)"/>
+    </g>
+    <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
+        <text x="37" y="15" fill="#010101" fill-opacity=".3">$LANG translate</text>
+        <text x="37" y="14">$LANG translate</text>
+        <text x="100" y="15" fill="#010101" fill-opacity=".3">${PERCENTAGE}%</text>
+        <text x="100" y="14">${PERCENTAGE}%</text>
+    </g>
+</svg>
+EOF
+done

scripts/install.sh

@@ -78,6 +78,10 @@ elif command -v apk &>/dev/null; then
   info "Обнаружен apk"
   pkgFormat="apk"
   pkgMgr="apk"
+elif command -v apt-get &>/dev/null; then
+  info "Обнаружен apt-get"
+  pkgFormat="rpm"
+  pkgMgr="apt-get"
 else
   warn "Не обнаружен поддерживаемый менеджер пакетов!"
   noPkgMgr=true
@@ -93,12 +97,16 @@ if [ -z "$noPkgMgr" ]; then
   echo "Полученный список файлов:"
   echo "$fileList"
 
-  if [ "$pkgMgr" == "pacman" ]; then
-    latestFile=$(echo "$fileList" | grep -E 'alr-bin-.*.pkg.tar.zst' | sort -V | tail -n 1)
-  elif [ "$pkgMgr" == "apt" ]; then
-    latestFile=$(echo "$fileList" | grep -E 'alr-bin-.*.amd64.deb' | sort -V | tail -n 1)
-  elif [[ "$pkgMgr" == "dnf" || "$pkgMgr" == "yum" || "$pkgMgr" == "zypper" ]]; then
-    latestFile=$(echo "$fileList" | grep -E 'alr-bin-.*.x86_64.rpm' | sort -V | tail -n 1)
+if [ "$pkgMgr" == "pacman" ]; then
+    latestFile=$(echo "$fileList" | grep -E 'alr-bin-.*\.pkg\.tar\.zst' | sort -V | tail -n 1)
+elif [ "$pkgMgr" == "apt" ]; then
+    latestFile=$(echo "$fileList" | grep -E 'alr-bin-.*\.amd64\.deb' | sort -V | tail -n 1)
+elif [ "$pkgMgr" == "apt-get" ]; then
+    latestFile=$(echo "$fileList" | grep -E 'alr-bin-.*-alt[0-9]+\.x86_64\.rpm' | sort -V | tail -n 1)
+elif [[ "$pkgMgr" == "dnf" || "$pkgMgr" == "yum" || "$pkgMgr" == "zypper" ]]; then
+    latestFile=$(echo "$fileList" | grep -E 'alr-bin-.*\.x86_64\.rpm' | sort -V | tail -n 1)
+fi
+
   else
     error "Не поддерживаемый менеджер пакетов для автоматической установки"
   fi

search.go

@@ -0,0 +1,125 @@
+// 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 main
+
+import (
+	"fmt"
+	"log/slog"
+	"os"
+	"text/template"
+
+	"github.com/leonelquinteros/gotext"
+	"github.com/urfave/cli/v2"
+
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/search"
+)
+
+func SearchCmd() *cli.Command {
+	return &cli.Command{
+		Name:    "search",
+		Usage:   gotext.Get("Search packages"),
+		Aliases: []string{"s"},
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:    "name",
+				Aliases: []string{"n"},
+				Usage:   gotext.Get("Search by name"),
+			},
+			&cli.StringFlag{
+				Name:    "description",
+				Aliases: []string{"d"},
+				Usage:   gotext.Get("Search by description"),
+			},
+			&cli.StringFlag{
+				Name:    "repository",
+				Aliases: []string{"repo"},
+				Usage:   gotext.Get("Search by repository"),
+			},
+			&cli.StringFlag{
+				Name:    "provides",
+				Aliases: []string{"p"},
+				Usage:   gotext.Get("Search by provides"),
+			},
+			&cli.StringFlag{
+				Name:    "format",
+				Aliases: []string{"f"},
+				Usage:   gotext.Get("Format output using a Go template"),
+			},
+		},
+		Action: func(c *cli.Context) error {
+			ctx := c.Context
+			cfg := config.New()
+			err := cfg.Load()
+			if err != nil {
+				slog.Error(gotext.Get("Error loading config"), "err", err)
+				os.Exit(1)
+			}
+
+			db := database.New(cfg)
+			err = db.Init(ctx)
+			defer db.Close()
+
+			if err != nil {
+				slog.Error(gotext.Get("Error initialization database"), "err", err)
+				os.Exit(1)
+			}
+
+			format := c.String("format")
+			var tmpl *template.Template
+			if format != "" {
+				tmpl, err = template.New("format").Parse(format)
+				if err != nil {
+					slog.Error(gotext.Get("Error parsing format template"), "err", err)
+					os.Exit(1)
+				}
+			}
+
+			s := search.New(db)
+
+			packages, err := s.Search(
+				ctx,
+				search.NewSearchOptions().
+					WithName(c.String("name")).
+					WithDescription(c.String("description")).
+					WithRepository(c.String("repository")).
+					WithProvides(c.String("provides")).
+					Build(),
+			)
+			if err != nil {
+				slog.Error(gotext.Get("Error parsing format template"), "err", err)
+				os.Exit(1)
+			}
+
+			for _, dbPkg := range packages {
+				if tmpl != nil {
+					err = tmpl.Execute(os.Stdout, dbPkg)
+					if err != nil {
+						slog.Error(gotext.Get("Error executing template"), "err", err)
+						os.Exit(1)
+					}
+					fmt.Println()
+				} else {
+					fmt.Println(dbPkg.Name)
+				}
+			}
+
+			return nil
+		},
+	}
+}

upgrade.go

@@ -29,16 +29,16 @@ import (
 	"github.com/urfave/cli/v2"
 	"go.elara.ws/vercmp"
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/search"
 )
 
 func UpgradeCmd() *cli.Command {
@@ -56,7 +56,20 @@ func UpgradeCmd() *cli.Command {
 		Action: func(c *cli.Context) error {
 			ctx := c.Context
 
-			cfg := config.GetInstance(ctx)
+			cfg := config.New()
+			err := cfg.Load()
+			if err != nil {
+				slog.Error(gotext.Get("Error loading config"), "err", err)
+				os.Exit(1)
+			}
+
+			db := database.New(cfg)
+			rs := repos.New(cfg, db)
+			err = db.Init(ctx)
+			if err != nil {
+				slog.Error(gotext.Get("Error initialization database"), "err", err)
+				os.Exit(1)
+			}
 
 			info, err := distro.ParseOSRelease(ctx)
 			if err != nil {
@@ -70,22 +83,33 @@ func UpgradeCmd() *cli.Command {
 				os.Exit(1)
 			}
 
-			if cfg.AutoPull(ctx) {
-				err = repos.Pull(ctx, config.Config(ctx).Repos)
+			if cfg.AutoPull() {
+				err = rs.Pull(ctx, cfg.Repos())
 				if err != nil {
 					slog.Error(gotext.Get("Error pulling repos"), "err", err)
 					os.Exit(1)
 				}
 			}
 
-			updates, err := checkForUpdates(ctx, mgr, info)
+			updates, err := checkForUpdates(ctx, mgr, cfg, db, rs, info)
 			if err != nil {
 				slog.Error(gotext.Get("Error checking for updates"), "err", err)
 				os.Exit(1)
 			}
 
 			if len(updates) > 0 {
-				build.InstallPkgs(ctx, updates, nil, types.BuildOpts{
+				builder := build.NewBuilder(
+					ctx,
+					types.BuildOpts{
+						Manager:     mgr,
+						Clean:       c.Bool("clean"),
+						Interactive: c.Bool("interactive"),
+					},
+					rs,
+					info,
+					cfg,
+				)
+				builder.InstallPkgs(ctx, updates, nil, types.BuildOpts{
 					Manager:     mgr,
 					Clean:       c.Bool("clean"),
 					Interactive: c.Bool("interactive"),
@@ -99,32 +123,45 @@ func UpgradeCmd() *cli.Command {
 	}
 }
 
-func checkForUpdates(ctx context.Context, mgr manager.Manager, info *distro.OSRelease) ([]db.Package, error) {
+func checkForUpdates(
+	ctx context.Context,
+	mgr manager.Manager,
+	cfg *config.ALRConfig,
+	db *database.Database,
+	rs *repos.Repos,
+	info *distro.OSRelease,
+) ([]database.Package, error) {
 	installed, err := mgr.ListInstalled(nil)
 	if err != nil {
 		return nil, err
 	}
 
 	pkgNames := maps.Keys(installed)
-	found, _, err := repos.FindPkgs(ctx, pkgNames)
+
+	s := search.New(db)
+
+	var out []database.Package
+	for _, pkgName := range pkgNames {
+		matches := build.RegexpALRPackageName.FindStringSubmatch(pkgName)
+		if matches != nil {
+			packageName := matches[build.RegexpALRPackageName.SubexpIndex("package")]
+			repoName := matches[build.RegexpALRPackageName.SubexpIndex("repo")]
+
+			pkgs, err := s.Search(
+				ctx,
+				search.NewSearchOptions().
+					WithName(packageName).
+					WithRepository(repoName).
+					Build(),
+			)
 			if err != nil {
 				return nil, err
 			}
 
-	var out []db.Package
-	for pkgName, pkgs := range found {
-		if slices.Contains(config.Config(ctx).IgnorePkgUpdates, pkgName) {
+			if len(pkgs) == 0 {
 				continue
 			}
 
-		if len(pkgs) > 1 {
-			// Puts the element with the highest version first
-			slices.SortFunc(pkgs, func(a, b db.Package) int {
-				return vercmp.Compare(a.Version, b.Version)
-			})
-		}
-
-		// First element is the package we want to install
 			pkg := pkgs[0]
 
 			repoVer := pkg.Version
@@ -143,5 +180,8 @@ func checkForUpdates(ctx context.Context, mgr manager.Manager, info *distro.OSRe
 				out = append(out, pkg)
 			}
 		}
+
+	}
+
 	return out, nil
 }