Merge pull request 'chore: update package name in Makefile' (#45 ) from Maks1mS/ALR:fix/correct-set-version into master

Reviewed-on: Plemya-x/ALR#45
chore: update package name in Makefile
2025-03-12 15:18:01 +00:00 · 2025-03-12 15:11:19 +03:00 · 2025-03-11 17:30:49 +00:00 · 2025-03-11 20:28:41 +03:00 · 2025-03-10 14:50:02 +03:00 · 2025-03-09 20:59:05 +00:00
39 changed files with 1046 additions and 924 deletions
--- a/.golangci.yml
+++ b/.golangci.yml
@ -47,4 +47,4 @@ issues:
    # TODO: remove
    - linters:
        - staticcheck
-      text: "SA1019:"
+      text: "SA1019: interp.ExecHandler"
--- a/3
+++ b/3
@ -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,6 +66,7 @@ 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
--- a/README.md
+++ b/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,7 +44,7 @@ ALR был создан потому, что упаковка программн

 ## Документация

-Документация по всем этим вопросам находится в [Wiki](https://gitea.plemya-x.ru/xpamych/ALR/wiki/Home).
+Документация находится в [Wiki](https://disc.plemya-x.ru/c/alr/wiki-alr).

 ---

@ -52,17 +52,15 @@ ALR был создан потому, что упаковка программн

 Репозитории alr - это git-хранилища, которые содержат каталог для каждого пакета с файлом `alr.sh` внутри. Файл `alr.sh` содержит все инструкции по сборке пакета и информацию о нем. Скрипты `alr.sh` аналогичны скриптам Aur PKGBUILD. 

-Например, репозиторий [Plemya-x/xpamych-alr-repo](https://gitea.plemya-x.ru/Plemya-x/xpamych-alr-repo.git) можно подключить так:
+Например, репозиторий [Plemya-x/alr-repo](https://gitea.plemya-x.ru/Plemya-x/alr-repo.git) можно подключить так:
 ```
-alr addrepo --name xpamych-alr-repo --url https://gitea.plemya-x.ru/Plemya-x/xpamych-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

 ## Спасибы
@ -75,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>
--- a/assets/coverage-badge.svg
+++ b/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">20.5%</text>
-        <text x="86" y="14">20.5%</text>
+        <text x="86" y="15" fill="#010101" fill-opacity=".3">19.5%</text>
+        <text x="86" y="14">19.5%</text>
    </g>
 </svg>
--- a/assets/i18n-ru-badge.svg
+++ b/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">100.00%</text>
+        <text x="100" y="14">100.00%</text>
+    </g>
+</svg>
--- a/build.go
+++ b/build.go
@ -50,9 +50,9 @@ func BuildCmd() *cli.Command {
 				Usage:   gotext.Get("Path to the build script"),
 			},
 			&cli.StringFlag{
-				Name:    "script-package",
-				Aliases: []string{"sp"},
-				Usage:   gotext.Get("Specify package in script (for multi package script only)"),
+				Name:    "subpackage",
+				Aliases: []string{"sb"},
+				Usage:   gotext.Get("Specify subpackage in script (for multi package script only)"),
 			},
 			&cli.StringFlag{
 				Name:    "package",
@ -72,14 +72,13 @@ func BuildCmd() *cli.Command {
 			rs := repos.New(cfg, db)
 			err := db.Init(ctx)
 			if err != nil {
-				slog.Error(gotext.Get("Error db init"), "err", err)
+				slog.Error(gotext.Get("Error initialization database"), "err", err)
 				os.Exit(1)
 			}

 			var script string
 			var packages []string
-
-			// Проверяем, установлен ли флаг script (-s)
+			repository := "default"

 			repoDir := cfg.GetPaths(ctx).RepoDir

@ -106,11 +105,13 @@ func BuildCmd() *cli.Command {
 					os.Exit(1)
 				}

+				repository = pkg[0].Repository
+
 				if pkg[0].BasePkgName != "" {
-					script = filepath.Join(repoDir, pkg[0].Repository, pkg[0].BasePkgName, "alr.sh")
+					script = filepath.Join(repoDir, repository, pkg[0].BasePkgName, "alr.sh")
 					packages = append(packages, pkg[0].Name)
 				} else {
-					script = filepath.Join(repoDir, pkg[0].Repository, pkg[0].Name, "alr.sh")
+					script = filepath.Join(repoDir, repository, pkg[0].Name, "alr.sh")
 				}
 			default:
 				script = filepath.Join(repoDir, "alr.sh")
@ -142,6 +143,7 @@ func BuildCmd() *cli.Command {
 				ctx,
 				types.BuildOpts{
 					Packages:    packages,
+					Repository:  repository,
 					Script:      script,
 					Manager:     mgr,
 					Clean:       c.Bool("clean"),
--- a/fix.go
+++ b/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,9 +37,8 @@ func FixCmd() *cli.Command {
 		Usage: gotext.Get("Attempt to fix problems with ALR"),
 		Action: func(c *cli.Context) error {
 			ctx := c.Context
-
-			db.Close()
-			paths := config.GetPaths(ctx)
+			cfg := config.New()
+			paths := cfg.GetPaths(ctx)

 			slog.Info(gotext.Get("Removing cache directory"))

@ -57,7 +56,15 @@ func FixCmd() *cli.Command {
 				os.Exit(1)
 			}

-			err = repos.Pull(ctx, config.Config(ctx).Repos)
+			cfg = config.New()
+			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(ctx))
 			if err != nil {
 				slog.Error(gotext.Get("Error pulling repos"), "err", err)
 				os.Exit(1)
--- a/info.go
+++ b/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,11 +48,39 @@ 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()
+			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)
+			db := database.New(cfg)
 			err := db.Init(ctx)
 			if err != nil {
 				slog.Error(gotext.Get("Error initialization database"), "err", err)
@ -88,6 +117,12 @@ 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 !all {
 				info, err := distro.ParseOSRelease(ctx)
 				if err != nil {
@ -97,7 +132,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)
--- a/install.go
+++ b/install.go
@ -46,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 {
@ -69,7 +69,7 @@ func InstallCmd() *cli.Command {
 			rs := repos.New(cfg, db)
 			err := db.Init(ctx)
 			if err != nil {
-				slog.Error(gotext.Get("Error db init"), "err", err)
+				slog.Error(gotext.Get("Error initialization database"), "err", err)
 				os.Exit(1)
 			}

@ -119,6 +119,11 @@ func InstallCmd() *cli.Command {
 		BashComplete: func(c *cli.Context) {
 			cfg := config.New()
 			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)
--- a/internal/cliutils/template.go
+++ b/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"),
+	)
+}
--- a/internal/config/config.go
+++ b/internal/config/config.go
@ -152,6 +152,13 @@ func (c *ALRConfig) Repos(ctx context.Context) []types.Repo {
 	return c.cfg.Repos
 }

+func (c *ALRConfig) SetRepos(ctx context.Context, repos []types.Repo) {
+	c.cfgOnce.Do(func() {
+		c.Load(ctx)
+	})
+	c.cfg.Repos = repos
+}
+
 func (c *ALRConfig) IgnorePkgUpdates(ctx context.Context) []string {
 	c.cfgOnce.Do(func() {
 		c.Load(ctx)
@ -172,3 +179,21 @@ func (c *ALRConfig) PagerStyle(ctx context.Context) string {
 	})
 	return c.cfg.PagerStyle
 }
+
+func (c *ALRConfig) AllowRunAsRoot(ctx context.Context) bool {
+	c.cfgOnce.Do(func() {
+		c.Load(ctx)
+	})
+	return c.cfg.Unsafe.AllowRunAsRoot
+}
+
+func (c *ALRConfig) RootCmd(ctx context.Context) string {
+	c.cfgOnce.Do(func() {
+		c.Load(ctx)
+	})
+	return c.cfg.RootCmd
+}
+
+func (c *ALRConfig) Save(f *os.File) error {
+	return toml.NewEncoder(f).Encode(c.cfg)
+}
--- a/internal/config/config_legacy.go
+++ b/internal/config/config_legacy.go
@ -1,52 +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 config
-
-import (
-	"context"
-	"sync"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
-)
-
-// 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
-}
--- a/internal/config/lang.go
+++ b/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
-}
--- a/internal/config/paths.go
+++ b/internal/config/paths.go
@ -19,10 +19,6 @@

 package config

-import (
-	"context"
-)
-
 // Paths contains various paths used by ALR
 type Paths struct {
 	ConfigDir  string
@ -32,14 +28,3 @@ type Paths struct {
 	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)
-}
--- a/internal/db/db_legacy.go
+++ b/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
-}
--- a/internal/dl/dl_test.go
+++ b/internal/dl/dl_test.go
@ -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)

--- a/internal/dlcache/dlcache_test.go
+++ b/internal/dlcache/dlcache_test.go
@ -32,14 +32,6 @@ 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
 }
--- a/internal/pager/pager.go
+++ b/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 {
--- a/internal/shutils/handlers/nop.go
+++ b/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
 }

--- a/internal/shutils/handlers/restricted.go
+++ b/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)
 			}
 		}

--- a/internal/translations/default.pot
+++ b/internal/translations/default.pot
@ -18,7 +18,7 @@ msgid "Path to the build script"
 msgstr ""

 #: build.go:55
-msgid "Specify package in script (for multi package script only)"
+msgid "Specify subpackage in script (for multi package script only)"
 msgstr ""

 #: build.go:60
@ -31,34 +31,34 @@ msgid ""
 msgstr ""

 #: build.go:75
-msgid "Error db init"
+msgid "Error initialization database"
 msgstr ""

-#: build.go:105
+#: build.go:104
 msgid "Package not found"
 msgstr ""

-#: build.go:123
+#: build.go:124
 msgid "Error pulling repositories"
 msgstr ""

-#: build.go:131
+#: build.go:132
 msgid "Unable to detect a supported package manager on the system"
 msgstr ""

-#: build.go:137
+#: build.go:138
 msgid "Error parsing os release"
 msgstr ""

-#: build.go:158
+#: build.go:160
 msgid "Error building package"
 msgstr ""

-#: build.go:165
+#: build.go:167
 msgid "Error getting working directory"
 msgstr ""

-#: build.go:174
+#: build.go:176
 msgid "Error moving the package"
 msgstr ""

@ -66,27 +66,27 @@ msgstr ""
 msgid "Attempt to fix problems with ALR"
 msgstr ""

-#: fix.go:44
+#: fix.go:43
 msgid "Removing cache directory"
 msgstr ""

-#: fix.go:48
+#: fix.go:47
 msgid "Unable to remove cache directory"
 msgstr ""

-#: fix.go:52
+#: fix.go:51
 msgid "Rebuilding cache"
 msgstr ""

-#: fix.go:56
+#: fix.go:55
 msgid "Unable to create new cache directory"
 msgstr ""

-#: fix.go:62
+#: fix.go:69
 msgid "Error pulling repos"
 msgstr ""

-#: fix.go:66
+#: fix.go:73
 msgid "Done"
 msgstr ""

@ -114,35 +114,39 @@ 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"
+#: info.go:63
+msgid "Error getting packages"
 msgstr ""

-#: info.go:64
+#: info.go:72
+msgid "Error iterating over packages"
+msgstr ""
+
+#: info.go:93
 msgid "Command info expected at least 1 argument, got %d"
 msgstr ""

-#: info.go:78
+#: info.go:107
 msgid "Error finding packages"
 msgstr ""

-#: info.go:94
+#: info.go:129
 msgid "Error parsing os-release file"
 msgstr ""

-#: info.go:103
+#: info.go:138
 msgid "Error resolving overrides"
 msgstr ""

-#: info.go:112 info.go:118
+#: info.go:147 info.go:153
 msgid "Error encoding script variables"
 msgstr ""

@ -154,23 +158,15 @@ msgstr ""
 msgid "Command install expected at least 1 argument, got %d"
 msgstr ""

-#: install.go:124
-msgid "Error getting packages"
-msgstr ""
-
-#: install.go:133
-msgid "Error iterating over packages"
-msgstr ""
-
-#: install.go:146
+#: install.go:151
 msgid "Remove an installed package"
 msgstr ""

-#: install.go:151
+#: install.go:156
 msgid "Command remove expected at least 1 argument, got %d"
 msgstr ""

-#: install.go:163
+#: install.go:168
 msgid "Error removing packages"
 msgstr ""

@ -198,6 +194,62 @@ msgstr ""
 msgid "Choose which optional package(s) to install"
 msgstr ""

+#: internal/cliutils/template.go:74 internal/cliutils/template.go:93
+msgid "NAME"
+msgstr ""
+
+#: internal/cliutils/template.go:74 internal/cliutils/template.go:94
+msgid "USAGE"
+msgstr ""
+
+#: internal/cliutils/template.go:74
+msgid "global options"
+msgstr ""
+
+#: 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:59
 msgid "Error opening config file, using defaults"
 msgstr ""
@ -234,10 +286,6 @@ msgstr ""
 msgid "Unable to create package cache directory"
 msgstr ""

-#: internal/config/lang.go:49
-msgid "Error parsing system language"
-msgstr ""
-
 #: internal/db/db.go:133
 msgid "Database version mismatch; resetting"
 msgstr ""
@ -247,10 +295,6 @@ 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 ""
@ -279,11 +323,11 @@ msgstr ""
 msgid "ERROR"
 msgstr ""

-#: list.go:40
+#: list.go:41
 msgid "List ALR repo packages"
 msgstr ""

-#: list.go:91
+#: list.go:92
 msgid "Error listing installed packages"
 msgstr ""

@ -299,82 +343,94 @@ msgstr ""
 msgid "Enable interactive questions and prompts"
 msgstr ""

-#: main.go:91
+#: main.go:92
 msgid ""
 "Running ALR as root is forbidden as it may cause catastrophic damage to your "
 "system"
 msgstr ""

 #: main.go:125
+msgid "Show help"
+msgstr ""
+
+#: main.go:129
 msgid "Error while running app"
 msgstr ""

-#: pkg/build/build.go:153
+#: pkg/build/build.go:156
 msgid "Failed to prompt user to view build script"
 msgstr ""

-#: pkg/build/build.go:157
+#: pkg/build/build.go:160
 msgid "Building package"
 msgstr ""

-#: pkg/build/build.go:228
+#: pkg/build/build.go:231
 msgid "Downloading sources"
 msgstr ""

-#: pkg/build/build.go:246
+#: pkg/build/build.go:253
 msgid "Building package metadata"
 msgstr ""

-#: pkg/build/build.go:268
+#: pkg/build/build.go:275
 msgid "Compressing package"
 msgstr ""

-#: pkg/build/build.go:419
+#: pkg/build/build.go:434
 msgid ""
 "Your system's CPU architecture doesn't match this package. Do you want to "
 "build anyway?"
 msgstr ""

-#: pkg/build/build.go:433
+#: pkg/build/build.go:448
 msgid "This package is already installed"
 msgstr ""

-#: pkg/build/build.go:457
+#: pkg/build/build.go:472
 msgid "Installing build dependencies"
 msgstr ""

-#: pkg/build/build.go:498
+#: pkg/build/build.go:513
 msgid "Installing dependencies"
 msgstr ""

-#: pkg/build/build.go:533
+#: pkg/build/build.go:548
 msgid "The checksums array must be the same length as sources"
 msgstr ""

-#: pkg/build/build.go:584
+#: pkg/build/build.go:599
 msgid "Would you like to remove the build dependencies?"
 msgstr ""

-#: pkg/build/build.go:647
+#: pkg/build/build.go:662
 msgid "Executing prepare()"
 msgstr ""

-#: pkg/build/build.go:657
+#: pkg/build/build.go:672
 msgid "Executing build()"
 msgstr ""

-#: pkg/build/build.go:687 pkg/build/build.go:707
+#: pkg/build/build.go:702 pkg/build/build.go:722
 msgid "Executing %s()"
 msgstr ""

-#: pkg/build/build.go:766
+#: pkg/build/build.go:781
 msgid "Error installing native packages"
 msgstr ""

-#: pkg/build/build.go:790
+#: pkg/build/build.go:805
 msgid "Error installing package"
 msgstr ""

+#: pkg/build/build.go:864
+msgid "AutoProv is not implemented for this package format, so it's skipped"
+msgstr ""
+
+#: pkg/build/build.go:875
+msgid "AutoReq is not implemented for this package format, so it's skipped"
+msgstr ""
+
 #: pkg/build/findDeps.go:35
 msgid "Command not found on the system"
 msgstr ""
@ -387,14 +443,6 @@ msgstr ""
 msgid "Required dependency found"
 msgstr ""

-#: pkg/build/utils.go:133
-msgid "AutoProv is not implemented for this package format, so it's skipped"
-msgstr ""
-
-#: pkg/build/utils.go:144
-msgid "AutoReq is not implemented for this package format, so it's skipped"
-msgstr ""
-
 #: pkg/repos/pull.go:79
 msgid "Pulling repository"
 msgstr ""
@ -425,35 +473,35 @@ msgstr ""
 msgid "URL of the new repo"
 msgstr ""

-#: repo.go:79 repo.go:136
+#: repo.go:82 repo.go:147
 msgid "Error opening config file"
 msgstr ""

-#: repo.go:85 repo.go:142
+#: repo.go:88 repo.go:153
 msgid "Error encoding config"
 msgstr ""

-#: repo.go:103
+#: repo.go:113
 msgid "Remove an existing repository"
 msgstr ""

-#: repo.go:110
+#: repo.go:120
 msgid "Name of the repo to be deleted"
 msgstr ""

-#: repo.go:128
+#: repo.go:139
 msgid "Repo does not exist"
 msgstr ""

-#: repo.go:148
+#: repo.go:159
 msgid "Error removing repo directory"
 msgstr ""

-#: repo.go:154
+#: repo.go:170
 msgid "Error removing packages from database"
 msgstr ""

-#: repo.go:166
+#: repo.go:182
 msgid "Pull all repositories that have changed"
 msgstr ""

@ -481,19 +529,11 @@ msgstr ""
 msgid "Format output using a Go template"
 msgstr ""

-#: search.go:94
-msgid "At least one search parameter is required"
-msgstr ""
-
-#: search.go:100
-msgid "Error db search"
-msgstr ""
-
-#: search.go:109
+#: search.go:82 search.go:99
 msgid "Error parsing format template"
 msgstr ""

-#: search.go:124
+#: search.go:107
 msgid "Error executing template"
 msgstr ""

--- a/internal/translations/po/ru/default.po
+++ b/internal/translations/po/ru/default.po
@ -1,19 +1,19 @@
 #
-# 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Gtranslator 47.1\n"

 #: build.go:44
@ -25,8 +25,8 @@ msgid "Path to the build script"
 msgstr "Путь к скрипту сборки"

 #: build.go:55
-msgid "Specify package in script (for multi package script only)"
-msgstr ""
+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)"
@ -38,35 +38,34 @@ msgid ""
 msgstr "Создайте пакет с нуля, даже если уже имеется готовый пакет"

 #: build.go:75
-msgid "Error db init"
-msgstr ""
+msgid "Error initialization database"
+msgstr "Ошибка инициализации базы данных"

-#: build.go:105
+#: build.go:104
 msgid "Package not found"
-msgstr ""
+msgstr "Пакет не найден"

-#: build.go:123
+#: build.go:124
 msgid "Error pulling repositories"
 msgstr "Ошибка при извлечении репозиториев"

-#: build.go:131
+#: build.go:132
 msgid "Unable to detect a supported package manager on the system"
 msgstr "Не удалось обнаружить поддерживаемый менеджер пакетов в системе"

-#: build.go:137
-#, fuzzy
+#: build.go:138
 msgid "Error parsing os release"
 msgstr "Ошибка при разборе файла выпуска операционной системы"

-#: build.go:158
+#: build.go:160
 msgid "Error building package"
 msgstr "Ошибка при сборке пакета"

-#: build.go:165
+#: build.go:167
 msgid "Error getting working directory"
 msgstr "Ошибка при получении рабочего каталога"

-#: build.go:174
+#: build.go:176
 msgid "Error moving the package"
 msgstr "Ошибка при перемещении пакета"

@ -74,27 +73,27 @@ msgstr "Ошибка при перемещении пакета"
 msgid "Attempt to fix problems with ALR"
 msgstr "Попытка устранить проблемы с ALR"

-#: fix.go:44
+#: fix.go:43
 msgid "Removing cache directory"
 msgstr "Удаление каталога кэша"

-#: fix.go:48
+#: fix.go:47
 msgid "Unable to remove cache directory"
 msgstr "Не удалось удалить каталог кэша"

-#: fix.go:52
+#: fix.go:51
 msgid "Rebuilding cache"
 msgstr "Восстановление кэша"

-#: fix.go:56
+#: fix.go:55
 msgid "Unable to create new cache directory"
 msgstr "Не удалось создать новый каталог кэша"

-#: fix.go:62
+#: fix.go:69
 msgid "Error pulling repos"
 msgstr "Ошибка при извлечении репозиториев"

-#: fix.go:66
+#: fix.go:73
 msgid "Done"
 msgstr "Сделано"

@ -122,35 +121,39 @@ 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:63
+msgid "Error getting packages"
+msgstr "Ошибка при получении пакетов"

-#: info.go:64
+#: info.go:72
+msgid "Error iterating over packages"
+msgstr "Ошибка при переборе пакетов"
+
+#: info.go:93
 msgid "Command info expected at least 1 argument, got %d"
 msgstr "Для команды info ожидался хотя бы 1 аргумент, получено %d"

-#: info.go:78
+#: info.go:107
 msgid "Error finding packages"
 msgstr "Ошибка при поиске пакетов"

-#: info.go:94
+#: info.go:129
 msgid "Error parsing os-release file"
 msgstr "Ошибка при разборе файла выпуска операционной системы"

-#: info.go:103
+#: info.go:138
 msgid "Error resolving overrides"
 msgstr "Ошибка устранения переорпеделений"

-#: info.go:112 info.go:118
+#: info.go:147 info.go:153
 msgid "Error encoding script variables"
 msgstr "Ошибка кодирования переменных скрита"

@ -162,23 +165,15 @@ msgstr "Установить новый пакет"
 msgid "Command install expected at least 1 argument, got %d"
 msgstr "Для команды install ожидался хотя бы 1 аргумент, получено %d"

-#: install.go:124
-msgid "Error getting packages"
-msgstr "Ошибка при получении пакетов"
-
-#: install.go:133
-msgid "Error iterating over packages"
-msgstr "Ошибка при переборе пакетов"
-
-#: install.go:146
+#: install.go:151
 msgid "Remove an installed package"
 msgstr "Удалить установленный пакет"

-#: install.go:151
+#: install.go:156
 msgid "Command remove expected at least 1 argument, got %d"
 msgstr "Для команды remove ожидался хотя бы 1 аргумент, получено %d"

-#: install.go:163
+#: install.go:168
 msgid "Error removing packages"
 msgstr "Ошибка при удалении пакетов"

@ -206,6 +201,62 @@ msgstr "Выберите, какой пакет использовать для
 msgid "Choose which optional package(s) to install"
 msgstr "Выберите, какой дополнительный пакет(ы) следует установить"

+#: internal/cliutils/template.go:74 internal/cliutils/template.go:93
+msgid "NAME"
+msgstr "НАЗВАНИЕ"
+
+#: internal/cliutils/template.go:74 internal/cliutils/template.go:94
+msgid "USAGE"
+msgstr "ИСПОЛЬЗОВАНИЕ"
+
+#: internal/cliutils/template.go:74
+msgid "global options"
+msgstr "глобальные опции"
+
+#: 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:59
 msgid "Error opening config file, using defaults"
 msgstr ""
@ -246,10 +297,6 @@ msgstr "Не удалось создать каталог кэша репози
 msgid "Unable to create package cache directory"
 msgstr "Не удалось создать каталог кэша пакетов"

-#: internal/config/lang.go:49
-msgid "Error parsing system language"
-msgstr "Ошибка при парсинге языка системы"
-
 #: internal/db/db.go:133
 msgid "Database version mismatch; resetting"
 msgstr "Несоответствие версий базы данных; сброс настроек"
@ -260,10 +307,6 @@ msgid ""
 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 "Исходный код можно обновлять, обновляя при необходимости"
@ -282,21 +325,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:92
 msgid "Error listing installed packages"
 msgstr "Ошибка при составлении списка установленных пакетов"

@ -312,7 +355,7 @@ msgstr "Аргументы, которые будут переданы мене
 msgid "Enable interactive questions and prompts"
 msgstr "Включение интерактивных вопросов и запросов"

-#: main.go:91
+#: main.go:92
 msgid ""
 "Running ALR as root is forbidden as it may cause catastrophic damage to your "
 "system"
@ -321,30 +364,34 @@ msgstr ""
 "катастрофическому повреждению вашей системы"

 #: main.go:125
+msgid "Show help"
+msgstr "Показать справку"
+
+#: main.go:129
 msgid "Error while running app"
 msgstr "Ошибка при запуске приложения"

-#: pkg/build/build.go:153
+#: pkg/build/build.go:156
 msgid "Failed to prompt user to view build script"
 msgstr "Не удалось предложить пользователю просмотреть скрипт сборки"

-#: pkg/build/build.go:157
+#: pkg/build/build.go:160
 msgid "Building package"
 msgstr "Сборка пакета"

-#: pkg/build/build.go:228
+#: pkg/build/build.go:231
 msgid "Downloading sources"
 msgstr "Скачивание источников"

-#: pkg/build/build.go:246
+#: pkg/build/build.go:253
 msgid "Building package metadata"
 msgstr "Сборка метаданных пакета"

-#: pkg/build/build.go:268
+#: pkg/build/build.go:275
 msgid "Compressing package"
 msgstr "Сжатие пакета"

-#: pkg/build/build.go:419
+#: pkg/build/build.go:434
 msgid ""
 "Your system's CPU architecture doesn't match this package. Do you want to "
 "build anyway?"
@ -352,47 +399,56 @@ msgstr ""
 "Архитектура процессора вашей системы не соответствует этому пакету. Вы все "
 "равно хотите выполнить сборку?"

-#: pkg/build/build.go:433
+#: pkg/build/build.go:448
 msgid "This package is already installed"
 msgstr "Этот пакет уже установлен"

-#: pkg/build/build.go:457
+#: pkg/build/build.go:472
 msgid "Installing build dependencies"
 msgstr "Установка зависимостей сборки"

-#: pkg/build/build.go:498
+#: pkg/build/build.go:513
 msgid "Installing dependencies"
 msgstr "Установка зависимостей"

-#: pkg/build/build.go:533
+#: pkg/build/build.go:548
 msgid "The checksums array must be the same length as sources"
 msgstr "Массив контрольных сумм должен быть той же длины, что и источники"

-#: pkg/build/build.go:584
+#: pkg/build/build.go:599
 msgid "Would you like to remove the build dependencies?"
 msgstr "Хотели бы вы удалить зависимости сборки?"

-#: pkg/build/build.go:647
+#: pkg/build/build.go:662
 msgid "Executing prepare()"
 msgstr "Исполнение prepare()"

-#: pkg/build/build.go:657
+#: pkg/build/build.go:672
 msgid "Executing build()"
 msgstr "Исполнение build()"

-#: pkg/build/build.go:687 pkg/build/build.go:707
-#, fuzzy
+#: pkg/build/build.go:702 pkg/build/build.go:722
 msgid "Executing %s()"
-msgstr "Исполнение files()"
+msgstr "Исполнение %s()"

-#: pkg/build/build.go:766
+#: pkg/build/build.go:781
 msgid "Error installing native packages"
 msgstr "Ошибка при установке нативных пакетов"

-#: pkg/build/build.go:790
+#: pkg/build/build.go:805
 msgid "Error installing package"
 msgstr "Ошибка при установке пакета"

+#: pkg/build/build.go:864
+msgid "AutoProv is not implemented for this package format, so it's skipped"
+msgstr ""
+"AutoProv не реализовано для этого формата пакета, поэтому будет пропущено"
+
+#: pkg/build/build.go:875
+msgid "AutoReq is not implemented for this package format, so it's skipped"
+msgstr ""
+"AutoReq не реализовано для этого формата пакета, поэтому будет пропущено"
+
 #: pkg/build/findDeps.go:35
 msgid "Command not found on the system"
 msgstr "Команда не найдена в системе"
@ -405,16 +461,6 @@ msgstr "Найденная предоставленная зависимость
 msgid "Required dependency found"
 msgstr "Найдена требуемая зависимость"

-#: pkg/build/utils.go:133
-msgid "AutoProv is not implemented for this package format, so it's skipped"
-msgstr ""
-"AutoProv не реализовано для этого формата пакета, поэтому будет пропущено"
-
-#: pkg/build/utils.go:144
-msgid "AutoReq is not implemented for this package format, so it's skipped"
-msgstr ""
-"AutoReq не реализовано для этого формата пакета, поэтому будет пропущено"
-
 #: pkg/repos/pull.go:79
 msgid "Pulling repository"
 msgstr "Скачивание репозитория"
@ -447,80 +493,69 @@ msgstr "Название нового репозитория"
 msgid "URL of the new repo"
 msgstr "URL-адрес нового репозитория"

-#: repo.go:79 repo.go:136
+#: repo.go:82 repo.go:147
 msgid "Error opening config file"
 msgstr "Ошибка при открытии конфигурационного файла"

-#: repo.go:85 repo.go:142
+#: repo.go:88 repo.go:153
 msgid "Error encoding config"
 msgstr "Ошибка при кодировании конфигурации"

-#: repo.go:103
+#: repo.go:113
 msgid "Remove an existing repository"
 msgstr "Удалить существующий репозиторий"

-#: repo.go:110
+#: repo.go:120
 msgid "Name of the repo to be deleted"
 msgstr "Название репозитория  удалён"

-#: repo.go:128
+#: repo.go:139
 msgid "Repo does not exist"
 msgstr "Репозитория не существует"

-#: repo.go:148
+#: repo.go:159
 msgid "Error removing repo directory"
 msgstr "Ошибка при удалении каталога репозитория"

-#: repo.go:154
+#: repo.go:170
 msgid "Error removing packages from database"
 msgstr "Ошибка при удалении пакетов из базы данных"

-#: repo.go:166
+#: repo.go:182
 msgid "Pull all repositories that have changed"
 msgstr "Скачать все изменённые репозитории"

 #: search.go:36
 msgid "Search packages"
-msgstr ""
+msgstr "Поиск пакетов"

 #: search.go:42
 msgid "Search by name"
-msgstr ""
+msgstr "Искать по имени"

 #: search.go:47
 msgid "Search by description"
-msgstr ""
+msgstr "Искать по описанию"

 #: search.go:52
-#, fuzzy
 msgid "Search by repository"
-msgstr "Добавить новый репозиторий"
+msgstr "Искать по репозиторию"

 #: search.go:57
 msgid "Search by provides"
-msgstr ""
+msgstr "Иcкать по provides"

 #: search.go:62
 msgid "Format output using a Go template"
-msgstr ""
+msgstr "Формат выходных данных с использованием шаблона Go"

-#: search.go:94
-msgid "At least one search parameter is required"
-msgstr ""
-
-#: search.go:100
-msgid "Error db search"
-msgstr ""
-
-#: search.go:109
-#, fuzzy
+#: search.go:82 search.go:99
 msgid "Error parsing format template"
-msgstr "Ошибка при разборе файла выпуска операционной системы"
+msgstr "Ошибка при разборе шаблона"

-#: search.go:124
-#, fuzzy
+#: search.go:107
 msgid "Error executing template"
-msgstr "Ошибка при получении пакетов"
+msgstr "Ошибка при выполнении шаблона"

 #: upgrade.go:47
 msgid "Upgrade all installed packages"
@ -534,6 +569,12 @@ msgstr "Ошибка при проверке обновлений"
 msgid "There is nothing to do."
 msgstr "Здесь нечего делать."

+#~ msgid "Error parsing system language"
+#~ msgstr "Ошибка при парсинге языка системы"
+
+#~ msgid "Error opening database"
+#~ msgstr "Ошибка при открытии базы данных"
+
 #~ msgid "Executing version()"
 #~ msgstr "Исполнение версия()"

--- a/internal/types/build.go
+++ b/internal/types/build.go
@ -23,6 +23,7 @@ import "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"

 type BuildOpts struct {
 	Script      string
+	Repository  string
 	Packages    []string
 	Manager     manager.Manager
 	Clean       bool
@ -102,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 {
--- a/list.go
+++ b/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"
 )
@ -78,7 +79,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 +87,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() {
@ -106,7 +116,7 @@ func ListCmd() *cli.Command {

 				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 {
--- a/main.go
+++ b/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"

@ -85,9 +85,10 @@ func GetApp() *cli.App {
 		},
 		Before: func(c *cli.Context) error {
 			ctx := c.Context
+			cfg := config.New()

 			cmd := c.Args().First()
-			if cmd != "helper" && !config.Config(ctx).Unsafe.AllowRunAsRoot && os.Geteuid() == 0 {
+			if cmd != "helper" && !cfg.AllowRunAsRoot(ctx) && 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)
 			}
@ -99,9 +100,6 @@ func GetApp() *cli.App {

 			return nil
 		},
-		After: func(ctx *cli.Context) error {
-			return db.Close()
-		},
 		EnableBashCompletion: true,
 	}
 }
@ -111,15 +109,21 @@ func main() {
 	logger.SetupDefault()

 	app := GetApp()
+	cfg := config.New()

 	ctx := context.Background()

 	// Set the root command to the one set in the ALR config
-	manager.DefaultRootCmd = config.Config(ctx).RootCmd
+	manager.DefaultRootCmd = cfg.RootCmd(ctx)

 	ctx, cancel := signal.NotifyContext(ctx, syscall.SIGINT, syscall.SIGTERM)
 	defer cancel()

+	// 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)
--- a/pkg/build/build.go
+++ b/pkg/build/build.go
@ -28,6 +28,8 @@ import (
 	"log/slog"
 	"os"
 	"path/filepath"
+	"slices"
+	"strconv"
 	"strings"
 	"time"

@ -87,6 +89,7 @@ func NewBuilder(

 func (b *Builder) UpdateOptsFromPkg(pkg *db.Package, packages []string) {
 	repodir := b.config.GetPaths(b.ctx).RepoDir
+	b.opts.Repository = pkg.Repository
 	if pkg.BasePkgName != "" {
 		b.opts.Script = filepath.Join(repodir, pkg.Repository, pkg.BasePkgName, "alr.sh")
 		b.opts.Packages = packages
@ -108,7 +111,10 @@ func (b *Builder) BuildPackage(ctx context.Context) ([]string, []string, error)
 		return nil, nil, err
 	}

-	dirs := b.getDirs(basePkg)
+	dirs, err := b.getDirs(basePkg)
+	if err != nil {
+		return nil, nil, err
+	}

 	builtPaths := make([]string, 0)

@ -116,14 +122,11 @@ func (b *Builder) BuildPackage(ctx context.Context) ([]string, []string, error)
 	// возвращаем его, а не собираем заново.
 	if !b.opts.Clean {
 		var remainingVars []*types.BuildVars
-
 		for _, vars := range varsOfPackages {
-			builtPkgPath, ok, err := checkForBuiltPackage(
-				b.opts.Manager,
+			builtPkgPath, ok, err := b.checkForBuiltPackage(
 				vars,
 				getPkgFormat(b.opts.Manager),
 				dirs.BaseDir,
-				b.info,
 			)
 			if err != nil {
 				return nil, nil, err
@ -238,7 +241,11 @@ func (b *Builder) BuildPackage(ctx context.Context) ([]string, []string, error)
 	}

 	for _, vars := range varsOfPackages {
-		funcOut, err := b.executePackageFunctions(ctx, dec, dirs, vars.Name)
+		packageName := ""
+		if vars.Base != "" {
+			packageName = vars.Name
+		}
+		funcOut, err := b.executePackageFunctions(ctx, dec, dirs, packageName)
 		if err != nil {
 			return nil, nil, err
 		}
@ -247,7 +254,7 @@ func (b *Builder) BuildPackage(ctx context.Context) ([]string, []string, error)

 		pkgFormat := getPkgFormat(b.opts.Manager) // Получаем формат пакета

-		pkgInfo, err := buildPkgMetadata(ctx, vars, dirs, pkgFormat, b.info, append(repoDeps, builtNames...), funcOut.Contents) // Собираем метаданные пакета
+		pkgInfo, err := b.buildPkgMetadata(ctx, vars, dirs, pkgFormat, append(repoDeps, builtNames...), funcOut.Contents) // Собираем метаданные пакета
 		if err != nil {
 			return nil, nil, err
 		}
@ -306,7 +313,7 @@ func (b *Builder) executeFirstPass(
 		interp.Env(expand.ListEnviron(env...)),                               // Устанавливаем окружение
 		interp.StdIO(os.Stdin, os.Stdout, os.Stderr),                         // Устанавливаем стандартный ввод-вывод
 		interp.ExecHandler(helpers.Restricted.ExecHandler(handlers.NopExec)), // Ограничиваем выполнение
-		interp.ReadDirHandler(handlers.RestrictedReadDir(scriptDir)),         // Ограничиваем чтение директорий
+		interp.ReadDirHandler2(handlers.RestrictedReadDir(scriptDir)),        // Ограничиваем чтение директорий
 		interp.StatHandler(handlers.RestrictedStat(scriptDir)),               // Ограничиваем доступ к статистике файлов
 		interp.OpenHandler(handlers.RestrictedOpen(scriptDir)),               // Ограничиваем открытие файлов
 	)
@ -366,6 +373,7 @@ func (b *Builder) executeFirstPass(
 		}
 		vars := preVars.ToBuildVars()
 		vars.Name = pkgName
+		vars.Base = pkgs.BasePkgName

 		varsOfPackages = append(varsOfPackages, &vars)
 	}
@ -374,14 +382,19 @@ func (b *Builder) executeFirstPass(
 }

 // Функция getDirs возвращает соответствующие директории для скрипта
-func (b *Builder) getDirs(basePkg string) types.Directories {
+func (b *Builder) getDirs(basePkg string) (types.Directories, error) {
+	scriptPath, err := filepath.Abs(b.opts.Script)
+	if err != nil {
+		return types.Directories{}, err
+	}
+
 	baseDir := filepath.Join(b.config.GetPaths(b.ctx).PkgsDir, basePkg) // Определяем базовую директорию
 	return types.Directories{
 		BaseDir:   baseDir,
 		SrcDir:    filepath.Join(baseDir, "src"),
 		PkgDir:    filepath.Join(baseDir, "pkg"),
-		ScriptDir: filepath.Dir(b.opts.Script),
-	}
+		ScriptDir: filepath.Dir(scriptPath),
+	}, nil
 }

 // Функция executeSecondPass выполняет скрипт сборки второй раз без каких-либо ограничений. Возвращается декодер,
@ -395,9 +408,11 @@ func (b *Builder) executeSecondPass(

 	fakeroot := handlers.FakerootExecHandler(2 * time.Second) // Настраиваем "fakeroot" для выполнения
 	runner, err := interp.New(
-		interp.Env(expand.ListEnviron(env...)),                    // Устанавливаем окружение
-		interp.StdIO(os.Stdin, os.Stdout, os.Stderr),              // Устанавливаем стандартный ввод-вывод
-		interp.ExecHandler(helpers.Helpers.ExecHandler(fakeroot)), // Обрабатываем выполнение через fakeroot
+		interp.Env(expand.ListEnviron(env...)),       // Устанавливаем окружение
+		interp.StdIO(os.Stdin, os.Stdout, os.Stderr), // Устанавливаем стандартный ввод-вывод
+		interp.ExecHandlers(func(next interp.ExecHandlerFunc) interp.ExecHandlerFunc {
+			return helpers.Helpers.ExecHandler(fakeroot)
+		}), // Обрабатываем выполнение через fakeroot
 	)
 	if err != nil {
 		return nil, err
@ -676,8 +691,8 @@ func (b *Builder) executePackageFunctions(
 	var filesFuncName string

 	if packageName == "" {
-		filesFuncName = "files"
 		packageFuncName = "package"
+		filesFuncName = "files"
 	} else {
 		packageFuncName = fmt.Sprintf("package_%s", packageName)
 		filesFuncName = fmt.Sprintf("files_%s", packageName)
@ -793,3 +808,108 @@ func (b *Builder) InstallALRPackages(ctx context.Context, pkgs []db.Package, opt
 		}
 	}
 }
+
+// Функция buildPkgMetadata создает метаданные для пакета, который будет собран.
+func (b *Builder) buildPkgMetadata(
+	ctx context.Context,
+	vars *types.BuildVars,
+	dirs types.Directories,
+	pkgFormat string,
+	deps []string,
+	preferedContents *[]string,
+) (*nfpm.Info, error) {
+	pkgInfo := getBasePkgInfo(vars, b.info, &b.opts)
+	pkgInfo.Description = vars.Description
+	pkgInfo.Platform = "linux"
+	pkgInfo.Homepage = vars.Homepage
+	pkgInfo.License = strings.Join(vars.Licenses, ", ")
+	pkgInfo.Maintainer = vars.Maintainer
+	pkgInfo.Overridables = nfpm.Overridables{
+		Conflicts: append(vars.Conflicts, vars.Name),
+		Replaces:  vars.Replaces,
+		Provides:  append(vars.Provides, vars.Name),
+		Depends:   deps,
+	}
+
+	if pkgFormat == "apk" {
+		// Alpine отказывается устанавливать пакеты, которые предоставляют сами себя, поэтому удаляем такие элементы
+		pkgInfo.Overridables.Provides = slices.DeleteFunc(pkgInfo.Overridables.Provides, func(s string) bool {
+			return s == pkgInfo.Name
+		})
+	}
+
+	if vars.Epoch != 0 {
+		pkgInfo.Epoch = strconv.FormatUint(uint64(vars.Epoch), 10)
+	}
+
+	setScripts(vars, pkgInfo, dirs.ScriptDir)
+
+	if slices.Contains(vars.Architectures, "all") {
+		pkgInfo.Arch = "all"
+	}
+
+	contents, err := buildContents(vars, dirs, preferedContents)
+	if err != nil {
+		return nil, err
+	}
+	pkgInfo.Overridables.Contents = contents
+
+	if len(vars.AutoProv) == 1 && decoder.IsTruthy(vars.AutoProv[0]) {
+		if pkgFormat == "rpm" {
+			err = rpmFindProvides(ctx, pkgInfo, dirs)
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			slog.Info(gotext.Get("AutoProv is not implemented for this package format, so it's skipped"))
+		}
+	}
+
+	if len(vars.AutoReq) == 1 && decoder.IsTruthy(vars.AutoReq[0]) {
+		if pkgFormat == "rpm" {
+			err = rpmFindRequires(ctx, pkgInfo, dirs)
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			slog.Info(gotext.Get("AutoReq is not implemented for this package format, so it's skipped"))
+		}
+	}
+
+	return pkgInfo, nil
+}
+
+// Функция checkForBuiltPackage пытается обнаружить ранее собранный пакет и вернуть его путь
+// и true, если нашла. Если нет, возвратит "", false, nil.
+func (b *Builder) checkForBuiltPackage(
+	vars *types.BuildVars,
+	pkgFormat,
+	baseDir string,
+) (string, bool, error) {
+	filename, err := b.pkgFileName(vars, pkgFormat)
+	if err != nil {
+		return "", false, err
+	}
+
+	pkgPath := filepath.Join(baseDir, filename)
+
+	_, err = os.Stat(pkgPath)
+	if err != nil {
+		return "", false, nil
+	}
+
+	return pkgPath, true, nil
+}
+
+// pkgFileName returns the filename of the package if it were to be built.
+// This is used to check if the package has already been built.
+func (b *Builder) pkgFileName(vars *types.BuildVars, pkgFormat string) (string, error) {
+	pkgInfo := getBasePkgInfo(vars, b.info, &b.opts)
+
+	packager, err := nfpm.Get(pkgFormat)
+	if err != nil {
+		return "", err
+	}
+
+	return packager.ConventionalFileName(pkgInfo), nil
+}
--- a/pkg/build/utils.go
+++ b/pkg/build/utils.go
@ -17,11 +17,11 @@
 package build

 import (
-	"context"
+	"fmt"
 	"io"
-	"log/slog"
 	"os"
 	"path/filepath"
+	"regexp"
 	"runtime"
 	"slices"
 	"strconv"
@ -33,7 +33,6 @@ import (
 	_ "github.com/goreleaser/nfpm/v2/arch"
 	_ "github.com/goreleaser/nfpm/v2/deb"
 	_ "github.com/goreleaser/nfpm/v2/rpm"
-	"github.com/leonelquinteros/gotext"
 	"mvdan.cc/sh/v3/syntax"

 	"github.com/goreleaser/nfpm/v2"
@ -42,7 +41,6 @@ import (
 	"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/shutils/decoder"
 	"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"
@ -77,77 +75,6 @@ func prepareDirs(dirs types.Directories) error {
 	return os.MkdirAll(dirs.PkgDir, 0o755) // Создаем директорию для пакетов
 }

-// Функция buildPkgMetadata создает метаданные для пакета, который будет собран.
-func buildPkgMetadata(
-	ctx context.Context,
-	vars *types.BuildVars,
-	dirs types.Directories,
-	pkgFormat string,
-	info *distro.OSRelease,
-	deps []string,
-	preferedContents *[]string,
-) (*nfpm.Info, error) {
-	pkgInfo := getBasePkgInfo(vars, info)
-	pkgInfo.Description = vars.Description
-	pkgInfo.Platform = "linux"
-	pkgInfo.Homepage = vars.Homepage
-	pkgInfo.License = strings.Join(vars.Licenses, ", ")
-	pkgInfo.Maintainer = vars.Maintainer
-	pkgInfo.Overridables = nfpm.Overridables{
-		Conflicts: vars.Conflicts,
-		Replaces:  vars.Replaces,
-		Provides:  vars.Provides,
-		Depends:   deps,
-	}
-
-	if pkgFormat == "apk" {
-		// Alpine отказывается устанавливать пакеты, которые предоставляют сами себя, поэтому удаляем такие элементы
-		pkgInfo.Overridables.Provides = slices.DeleteFunc(pkgInfo.Overridables.Provides, func(s string) bool {
-			return s == pkgInfo.Name
-		})
-	}
-
-	if vars.Epoch != 0 {
-		pkgInfo.Epoch = strconv.FormatUint(uint64(vars.Epoch), 10)
-	}
-
-	setScripts(vars, pkgInfo, dirs.ScriptDir)
-
-	if slices.Contains(vars.Architectures, "all") {
-		pkgInfo.Arch = "all"
-	}
-
-	contents, err := buildContents(vars, dirs, preferedContents)
-	if err != nil {
-		return nil, err
-	}
-	pkgInfo.Overridables.Contents = contents
-
-	if len(vars.AutoProv) == 1 && decoder.IsTruthy(vars.AutoProv[0]) {
-		if pkgFormat == "rpm" {
-			err = rpmFindProvides(ctx, pkgInfo, dirs)
-			if err != nil {
-				return nil, err
-			}
-		} else {
-			slog.Info(gotext.Get("AutoProv is not implemented for this package format, so it's skipped"))
-		}
-	}
-
-	if len(vars.AutoReq) == 1 && decoder.IsTruthy(vars.AutoReq[0]) {
-		if pkgFormat == "rpm" {
-			err = rpmFindRequires(ctx, pkgInfo, dirs)
-			if err != nil {
-				return nil, err
-			}
-		} else {
-			slog.Info(gotext.Get("AutoReq is not implemented for this package format, so it's skipped"))
-		}
-	}
-
-	return pkgInfo, nil
-}
-
 // Функция buildContents создает секцию содержимого пакета, которая содержит файлы,
 // которые будут включены в конечный пакет.
 func buildContents(vars *types.BuildVars, dirs types.Directories, preferedContents *[]string) ([]*files.Content, error) {
@ -244,33 +171,11 @@ func buildContents(vars *types.BuildVars, dirs types.Directories, preferedConten
 	return contents, nil
 }

-// Функция checkForBuiltPackage пытается обнаружить ранее собранный пакет и вернуть его путь
-// и true, если нашла. Если нет, возвратит "", false, nil.
-func checkForBuiltPackage(
-	mgr manager.Manager,
-	vars *types.BuildVars,
-	pkgFormat,
-	baseDir string,
-	info *distro.OSRelease,
-) (string, bool, error) {
-	filename, err := pkgFileName(vars, pkgFormat, info)
-	if err != nil {
-		return "", false, err
-	}
+var RegexpALRPackageName = regexp.MustCompile(`^(?P<package>[^+]+)\+alr-(?P<repo>.+)$`)

-	pkgPath := filepath.Join(baseDir, filename)
-
-	_, err = os.Stat(pkgPath)
-	if err != nil {
-		return "", false, nil
-	}
-
-	return pkgPath, true, nil
-}
-
-func getBasePkgInfo(vars *types.BuildVars, info *distro.OSRelease) *nfpm.Info {
+func getBasePkgInfo(vars *types.BuildVars, info *distro.OSRelease, opts *types.BuildOpts) *nfpm.Info {
 	return &nfpm.Info{
-		Name:    vars.Name,
+		Name:    fmt.Sprintf("%s+alr-%s", vars.Name, opts.Repository),
 		Arch:    cpu.Arch(),
 		Version: vars.Version,
 		Release: overrides.ReleasePlatformSpecific(vars.Release, info),
@ -278,19 +183,6 @@ func getBasePkgInfo(vars *types.BuildVars, info *distro.OSRelease) *nfpm.Info {
 	}
 }

-// pkgFileName returns the filename of the package if it were to be built.
-// This is used to check if the package has already been built.
-func pkgFileName(vars *types.BuildVars, pkgFormat string, info *distro.OSRelease) (string, error) {
-	pkgInfo := getBasePkgInfo(vars, info)
-
-	packager, err := nfpm.Get(pkgFormat)
-	if err != nil {
-		return "", err
-	}
-
-	return packager.ConventionalFileName(pkgInfo), nil
-}
-
 // Функция getPkgFormat возвращает формат пакета из менеджера пакетов,
 // или ALR_PKG_FORMAT, если он установлен.
 func getPkgFormat(mgr manager.Manager) string {
--- a/pkg/distro/osrelease.go
+++ b/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()),
 	)
--- a/pkg/gen/tmpls/pip.tmpl.sh
+++ b/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
 }
--- a/pkg/repos/pull.go
+++ b/pkg/repos/pull.go
@ -77,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(ctx).RepoDir, repo.Name)

 		var repoFS billy.Filesystem
 		gitDir := filepath.Join(repoDir, ".git")
@ -264,7 +264,7 @@ func (rs *Repos) processRepoChangesRunner(repoDir, scriptDir string) (*interp.Ru
 	return interp.New(
 		interp.Env(expand.ListEnviron(env...)),
 		interp.ExecHandler(handlers.NopExec),
-		interp.ReadDirHandler(handlers.RestrictedReadDir(repoDir)),
+		interp.ReadDirHandler2(handlers.RestrictedReadDir(repoDir)),
 		interp.StatHandler(handlers.RestrictedStat(repoDir)),
 		interp.OpenHandler(handlers.RestrictedOpen(repoDir)),
 		interp.StdIO(handlers.NopRWC{}, handlers.NopRWC{}, handlers.NopRWC{}),
--- a/pkg/repos/repos_legacy.go
+++ b/pkg/repos/repos_legacy.go
@ -1,60 +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"
-	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)
-}
-
-// =======================
-// 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
-}
--- a/pkg/search/search.go
+++ b/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
 }
--- a/pkg/search/search_options_builder.go
+++ b/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
+}
--- a/pkg/search/search_test.go
+++ b/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)
+		})
+	}
+}
--- a/repo.go
+++ b/repo.go
@ -30,7 +30,7 @@ import (
 	"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 +60,43 @@ func AddRepoCmd() *cli.Command {
 			name := c.String("name")
 			repoURL := c.String("url")

-			cfg := config.Config(ctx)
+			cfg := config.New()
+			reposSlice := cfg.Repos(ctx)

-			for _, repo := range 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,
 			})

-			cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath)
+			cfg.SetRepos(ctx, reposSlice)
+
+			cfgFl, err := os.Create(cfg.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)
+			err = cfg.Save(cfgFl)
 			if err != nil {
 				slog.Error(gotext.Get("Error encoding config"), "err", err)
 				os.Exit(1)
 			}

-			err = repos.Pull(ctx, cfg.Repos)
+			db := database.New(cfg)
+			err = db.Init(ctx)
+			if err != nil {
+				slog.Error(gotext.Get("Error pulling repos"), "err", err)
+			}
+
+			rs := repos.New(cfg, db)
+			err = rs.Pull(ctx, cfg.Repos(ctx))
 			if err != nil {
 				slog.Error(gotext.Get("Error pulling repos"), "err", err)
 				os.Exit(1)
@ -114,11 +124,12 @@ func RemoveRepoCmd() *cli.Command {
 			ctx := c.Context

 			name := c.String("name")
-			cfg := config.Config(ctx)
+			cfg := config.New()

 			found := false
 			index := 0
-			for i, repo := range cfg.Repos {
+			reposSlice := cfg.Repos(ctx)
+			for i, repo := range reposSlice {
 				if repo.Name == name {
 					index = i
 					found = true
@ -129,9 +140,9 @@ func RemoveRepoCmd() *cli.Command {
 				os.Exit(1)
 			}

-			cfg.Repos = slices.Delete(cfg.Repos, index, index+1)
+			cfg.SetRepos(ctx, slices.Delete(reposSlice, index, index+1))

-			cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath)
+			cfgFl, err := os.Create(cfg.GetPaths(ctx).ConfigPath)
 			if err != nil {
 				slog.Error(gotext.Get("Error opening config file"), "err", err)
 				os.Exit(1)
@ -143,12 +154,17 @@ func RemoveRepoCmd() *cli.Command {
 				os.Exit(1)
 			}

-			err = os.RemoveAll(filepath.Join(config.GetPaths(ctx).RepoDir, name))
+			err = os.RemoveAll(filepath.Join(cfg.GetPaths(ctx).RepoDir, name))
 			if err != nil {
 				slog.Error(gotext.Get("Error removing repo directory"), "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 +183,14 @@ 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()
+			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(ctx))
 			if err != nil {
 				slog.Error(gotext.Get("Error pulling repos"), "err", err)
 				os.Exit(1)
--- a/scripts/coverage-badge.sh
+++ b/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>
--- a/scripts/i18n-badge.sh
+++ b/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
--- a/search.go
+++ b/search.go
@ -20,7 +20,6 @@ import (
 	"fmt"
 	"log/slog"
 	"os"
-	"strings"
 	"text/template"

 	"github.com/leonelquinteros/gotext"
@ -28,6 +27,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/search"
 )

 func SearchCmd() *cli.Command {
@ -70,34 +70,7 @@ func SearchCmd() *cli.Command {
 			defer db.Close()

 			if err != nil {
-				slog.Error(gotext.Get("Error db init"), "err", err)
-				os.Exit(1)
-			}
-
-			var conditions []string
-			if name := c.String("name"); name != "" {
-				conditions = append(conditions, fmt.Sprintf("name LIKE '%%%s%%'", name))
-			}
-			if description := c.String("description"); description != "" {
-				conditions = append(conditions, fmt.Sprintf("description LIKE '%%%s%%'", description))
-			}
-			if repo := c.String("repository"); repo != "" {
-				conditions = append(conditions, fmt.Sprintf("repository = '%s'", repo))
-			}
-			if provides := c.String("provides"); provides != "" {
-				conditions = append(conditions, fmt.Sprintf("EXISTS (SELECT 1 FROM json_each(provides) WHERE value = '%s')", provides))
-			}
-			query := ""
-			if len(conditions) > 0 {
-				query = strings.Join(conditions, " AND ")
-			} else {
-				slog.Error(gotext.Get("At least one search parameter is required"))
-				os.Exit(1)
-			}
-
-			result, err := db.GetPkgs(ctx, query)
-			if err != nil {
-				slog.Error(gotext.Get("Error db search"), "err", err)
+				slog.Error(gotext.Get("Error initialization database"), "err", err)
 				os.Exit(1)
 			}

@ -111,13 +84,23 @@ func SearchCmd() *cli.Command {
 				}
 			}

-			for result.Next() {
-				var dbPkg database.Package
-				err = result.StructScan(&dbPkg)
-				if err != nil {
-					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 {
--- a/upgrade.go
+++ b/upgrade.go
@ -29,7 +29,6 @@ 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"
 	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
@ -39,6 +38,7 @@ import (
 	"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 {
@ -61,7 +61,7 @@ func UpgradeCmd() *cli.Command {
 			rs := repos.New(cfg, db)
 			err := db.Init(ctx)
 			if err != nil {
-				slog.Error(gotext.Get("Error db init"), "err", err)
+				slog.Error(gotext.Get("Error initialization database"), "err", err)
 				os.Exit(1)
 			}

@ -85,7 +85,7 @@ func UpgradeCmd() *cli.Command {
 				}
 			}

-			updates, err := checkForUpdates(ctx, mgr, cfg, rs, 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)
@ -121,6 +121,7 @@ func checkForUpdates(
 	ctx context.Context,
 	mgr manager.Manager,
 	cfg *config.ALRConfig,
+	db *database.Database,
 	rs *repos.Repos,
 	info *distro.OSRelease,
 ) ([]database.Package, error) {
@ -130,42 +131,47 @@ func checkForUpdates(
 	}

 	pkgNames := maps.Keys(installed)
-	found, _, err := rs.FindPkgs(ctx, pkgNames)
-	if err != nil {
-		return nil, err
-	}
+
+	s := search.New(db)

 	var out []database.Package
-	for pkgName, pkgs := range found {
-		if slices.Contains(cfg.IgnorePkgUpdates(ctx), pkgName) {
-			continue
+	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
+			}
+
+			pkg := pkgs[0]
+
+			repoVer := pkg.Version
+			releaseStr := overrides.ReleasePlatformSpecific(pkg.Release, info)
+
+			if pkg.Release != 0 && pkg.Epoch == 0 {
+				repoVer = fmt.Sprintf("%s-%s", pkg.Version, releaseStr)
+			} else if pkg.Release != 0 && pkg.Epoch != 0 {
+				repoVer = fmt.Sprintf("%d:%s-%s", pkg.Epoch, pkg.Version, releaseStr)
+			}
+
+			c := vercmp.Compare(repoVer, installed[pkgName])
+			if c == 0 || c == -1 {
+				continue
+			} else if c == 1 {
+				out = append(out, pkg)
+			}
 		}

-		if len(pkgs) > 1 {
-			// Puts the element with the highest version first
-			slices.SortFunc(pkgs, func(a, b database.Package) int {
-				return vercmp.Compare(a.Version, b.Version)
-			})
-		}
-
-		// First element is the package we want to install
-		pkg := pkgs[0]
-
-		repoVer := pkg.Version
-		releaseStr := overrides.ReleasePlatformSpecific(pkg.Release, info)
-
-		if pkg.Release != 0 && pkg.Epoch == 0 {
-			repoVer = fmt.Sprintf("%s-%s", pkg.Version, releaseStr)
-		} else if pkg.Release != 0 && pkg.Epoch != 0 {
-			repoVer = fmt.Sprintf("%d:%s-%s", pkg.Epoch, pkg.Version, releaseStr)
-		}
-
-		c := vercmp.Compare(repoVer, installed[pkgName])
-		if c == 0 || c == -1 {
-			continue
-		} else if c == 1 {
-			out = append(out, pkg)
-		}
 	}
+
 	return out, nil
 }
Author	SHA1	Message	Date
Евгений Храмов	9cb0a5e9ad	Merge pull request 'chore: update package name in Makefile' (#45 ) from Maks1mS/ALR:fix/correct-set-version into master Reviewed-on: Plemya-x/ALR#45	2025-03-12 15:18:01 +00:00
Maxim Slipenko	1a57ccdb83	chore: update package name in Makefile	2025-03-12 15:11:19 +03:00
Евгений Храмов	615cd83fb7	Merge pull request 'fix: resolve absolute path of ScriptDir' (#44 ) from Maks1mS/ALR:fix/use-abs-scriptdir-path into master Reviewed-on: Plemya-x/ALR#44	2025-03-11 17:30:49 +00:00
Maxim Slipenko	27e2f54653	fix: resolve absolute path of ScriptDir	2025-03-11 20:28:41 +03:00
Евгений (ХрамычЪ) Храмов	af57165c89	Небольшие правки и исправления.	2025-03-10 14:50:02 +03:00
Евгений Храмов	3770c82240	Merge pull request 'fix: add db.Init() in bash completion' (#42 ) from Maks1mS/ALR:fix/add-db-init-in-completion into master Reviewed-on: Plemya-x/ALR#42	2025-03-09 20:59:05 +00:00
Maxim Slipenko	2dff463303	i18n: update ru translation	2025-03-09 17:32:19 +03:00
Maxim Slipenko	9085e38454	fix: add db.Init() in bash completion	2025-03-09 17:30:02 +03:00
Евгений (ХрамычЪ) Храмов	a7d016abc9	Замена устаревшего метода установки в шаблоне `alr gen pip`	2025-03-02 13:50:11 +03:00
Евгений (ХрамычЪ) Храмов	4a5cca2d0f	Замена устаревшего метода установки в шаблоне `alr gen pip`	2025-03-02 13:34:22 +03:00
Евгений Храмов	71000fd3cd	Merge pull request 'fix: use unique names for packages' (#40 ) from Maks1mS/ALR:fix/use-unique-package-name into master Reviewed-on: Plemya-x/ALR#40	2025-03-02 06:49:52 +00:00
Maxim Slipenko	71968bbe13	fix: fix config saving	2025-02-28 21:14:59 +03:00
Maxim Slipenko	29c1a31066	fix: fix list and upgrade commands with new naming	2025-02-28 21:14:21 +03:00
Maxim Slipenko	8f94b61a0e	fix: use +alr-{reponame} suffix	2025-02-28 20:15:02 +03:00
Евгений Храмов	ae8e2d2807	Merge pull request 'chore: make the application more internationalized' (#39 ) from Maks1mS/ALR:chore/i18n into master Reviewed-on: Plemya-x/ALR#39 добавлен badge для русского языка переведены все строки переведены выводы help	2025-02-28 07:09:22 +00:00
Maxim Slipenko	0fa288b8a2	chore: make the application more internationalized	2025-02-27 16:41:18 +03:00
Maxim Slipenko	dcac0b9ee5	i18n: translate all strings	2025-02-27 11:43:20 +03:00
Maxim Slipenko	4e6e1f524a	chore: make the application more internationalized	2025-02-27 11:18:13 +03:00
Евгений Храмов	47a9b9a96c	Merge pull request 'chore: refactor code' (#38 ) from Maks1mS/ALR:chore/refactor-code into master Reviewed-on: Plemya-x/ALR#38 remove legacy code refactor search and add tests	2025-02-22 15:34:57 +00:00
Maxim Slipenko	9bb14312bd	chore: refactor code - remove legacy code - refactor search and add tests	2025-02-22 09:44:59 +03:00