.golangci.yml

@@ -1,46 +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/>.
-
-run:
-  timeout: 5m
-
-linters-settings:
-  goimports:
-    local-prefixes: "gitea.plemya-x.ru/Plemya-x/ALR"
-  gofmt:
-    simplify: true
-  gofumpt:
-    extra-rules: true
-
-linters:
-  enable:
-    - gofmt
-    - gofumpt
-    - goimports
-    - gocritic
-    - govet
-    - staticcheck
-    - unused
-    - errcheck
-    - typecheck
-#    - forbidigo
-
-issues:
-  fix: true
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - errcheck

.goreleaser.yaml

@@ -1,22 +1,3 @@
-# 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/>.
-
 before:
   hooks:
     - go mod tidy

.woodpecker.yml

@@ -1,22 +1,3 @@
-# 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/>.
-
 platform: linux/amd64
 pipeline:
   release:

Makefile

@@ -11,10 +11,6 @@ ZSH_COMPLETION := $(COMPLETIONS_DIR)/zsh
 INSTALLED_BASH_COMPLETION := $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$(NAME)
 INSTALLED_ZSH_COMPLETION := $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_$(NAME)
 
-ADD_LICENSE_BIN := go run github.com/google/addlicense@4caba19b7ed7818bb86bc4cd20411a246aa4a524
-GOLANGCI_LINT_BIN := go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2
-XGOTEXT_BIN := go run github.com/Tom5521/xgotext@v1.2.0
-
 .PHONY: build install clean clear uninstall check-no-root
 
 build: check-no-root $(BIN)
@@ -52,17 +48,3 @@ uninstall:
 
 clean clear:
 	rm -f $(BIN)
-
-OLD_FILES=$$(< old-files)
-IGNORE_OLD_FILES := $(foreach file,$(shell cat old-files),-ignore $(file))
-update-license:
-	$(ADD_LICENSE_BIN) -v -f license-header-old-files.tmpl $(OLD_FILES)
-	$(ADD_LICENSE_BIN) -v -f license-header.tmpl $(IGNORE_OLD_FILES) .
-
-fmt:
-	$(GOLANGCI_LINT_BIN) run --fix
-
-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

README.md

@@ -21,7 +21,7 @@ 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://gitea.plemya-x.ru/xpamych/ALR/install>. Пожалуйста, просматривайте любые скрипты, которые вы скачиваете из Интернета (включая этот), прежде чем запускать их.
 
 ### Сборка из исходного кода
 

build.go

@@ -1,103 +1,77 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// You should have received a copy of the GNU General Public License
+ */
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package main
 
 import (
-	"log/slog"
 	"os"
 	"path/filepath"
 
-	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
-
+	"plemya-x.ru/alr/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"plemya-x.ru/alr/internal/osutils"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/osutils"
+	"plemya-x.ru/alr/internal/types"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
+	"plemya-x.ru/alr/pkg/build"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
+	"plemya-x.ru/alr/pkg/loggerctx"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
+	"plemya-x.ru/alr/pkg/manager"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
+	"plemya-x.ru/alr/pkg/repos"
 )
 
-func BuildCmd() *cli.Command {
+var buildCmd = &cli.Command{
-	return &cli.Command{
 	Name:  "build",
-		Usage: gotext.Get("Build a local package"),
+	Usage: "Build a local package",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:    "script",
 			Aliases: []string{"s"},
 			Value:   "alr.sh",
-				Usage:   gotext.Get("Path to the build script"),
+			Usage:   "Path to the build script",
 		},
 		&cli.StringFlag{
 			Name:    "package",
 			Aliases: []string{"p"},
-				Usage:   gotext.Get("Name of the package to build and its repo (example: default/go-bin)"),
+			Usage:   "Name of the package to build and its repo (example: default/go-bin)",
 		},
 		&cli.BoolFlag{
 			Name:    "clean",
 			Aliases: []string{"c"},
-				Usage:   gotext.Get("Build package from scratch even if there's an already built package available"),
+			Usage:   "Build package from scratch even if there's an already built package available",
 		},
 	},
 	Action: func(c *cli.Context) error {
 		ctx := c.Context
+		log := loggerctx.From(ctx)
 
-			var script string
+		script := c.String("script")
-
+		if c.String("package") != "" {
-			// Проверяем, установлен ли флаг script (-s)
+			script = filepath.Join(config.GetPaths(ctx).RepoDir, c.String("package"), "alr.sh")
-			if c.IsSet("script") {
-				script = c.String("script")
-			} else if c.IsSet("package") {
-				// Если флаг script не установлен, проверяем флаг package (-p)
-				packageInput := c.String("package")
-				// Определяем, содержит ли packageInput символ '/'
-				if filepath.Dir(packageInput) == "." {
-					// Не указана директория репозитория, используем 'default' как префикс
-					script = filepath.Join(config.GetPaths(ctx).RepoDir, "default", packageInput, "alr.sh")
-				} else {
-					// Используем путь с указанным репозиторием
-					script = filepath.Join(config.GetPaths(ctx).RepoDir, packageInput, "alr.sh")
-				}
-			} else {
-				// Ни флаги script, ни package не установлены, используем дефолтный скрипт
-				script = filepath.Join(config.GetPaths(ctx).RepoDir, "alr.sh")
 		}
 
-			// Проверка автоматического пулла репозиториев
-			if config.GetInstance(ctx).AutoPull(ctx) {
 		err := repos.Pull(ctx, config.Config(ctx).Repos)
 		if err != nil {
-					slog.Error(gotext.Get("Error pulling repositories"), "err", err)
+			log.Fatal("Error pulling repositories").Err(err).Send()
-					os.Exit(1)
-				}
 		}
 
-			// Обнаружение менеджера пакетов
 		mgr := manager.Detect()
 		if mgr == nil {
-				slog.Error(gotext.Get("Unable to detect a supported package manager on the system"))
+			log.Fatal("Unable to detect a supported package manager on the system").Send()
-				os.Exit(1)
 		}
 
-			// Сборка пакета
 		pkgPaths, _, err := build.BuildPackage(ctx, types.BuildOpts{
 			Script:      script,
 			Manager:     mgr,
@@ -105,28 +79,22 @@ func BuildCmd() *cli.Command {
 			Interactive: c.Bool("interactive"),
 		})
 		if err != nil {
-				slog.Error(gotext.Get("Error building package"), "err", err)
+			log.Fatal("Error building package").Err(err).Send()
-				os.Exit(1)
 		}
 
-			// Получение текущей рабочей директории
 		wd, err := os.Getwd()
 		if err != nil {
-				slog.Error(gotext.Get("Error getting working directory"), "err", err)
+			log.Fatal("Error getting working directory").Err(err).Send()
-				os.Exit(1)
 		}
 
-			// Перемещение собранных пакетов в рабочую директорию
 		for _, pkgPath := range pkgPaths {
 			name := filepath.Base(pkgPath)
 			err = osutils.Move(pkgPath, filepath.Join(wd, name))
 			if err != nil {
-					slog.Error(gotext.Get("Error moving the package"), "err", err)
+				log.Fatal("Error moving the package").Err(err).Send()
-					os.Exit(1)
 			}
 		}
 
 		return nil
 	},
 }
-}

fix.go

@@ -1,71 +1,64 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// You should have received a copy of the GNU General Public License
+ */
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package main
 
 import (
-	"log/slog"
 	"os"
 
-	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
-
+	"plemya-x.ru/alr/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"plemya-x.ru/alr/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"plemya-x.ru/alr/pkg/loggerctx"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
+	"plemya-x.ru/alr/pkg/repos"
 )
 
-func FixCmd() *cli.Command {
+var fixCmd = &cli.Command{
-	return &cli.Command{
 	Name:  "fix",
-		Usage: gotext.Get("Attempt to fix problems with ALR"),
+	Usage: "Attempt to fix problems with ALR",
 	Action: func(c *cli.Context) error {
 		ctx := c.Context
+		log := loggerctx.From(ctx)
 
 		db.Close()
 		paths := config.GetPaths(ctx)
 
-			slog.Info(gotext.Get("Removing cache directory"))
+		log.Info("Removing cache directory").Send()
 
 		err := os.RemoveAll(paths.CacheDir)
 		if err != nil {
-				slog.Error(gotext.Get("Unable to remove cache directory"), "err", err)
+			log.Fatal("Unable to remove cache directory").Err(err).Send()
-				os.Exit(1)
 		}
 
-			slog.Info(gotext.Get("Rebuilding cache"))
+		log.Info("Rebuilding cache").Send()
 
 		err = os.MkdirAll(paths.CacheDir, 0o755)
 		if err != nil {
-				slog.Error(gotext.Get("Unable to create new cache directory"), "err", err)
+			log.Fatal("Unable to create new cache directory").Err(err).Send()
-				os.Exit(1)
 		}
 
 		err = repos.Pull(ctx, config.Config(ctx).Repos)
 		if err != nil {
-				slog.Error(gotext.Get("Error pulling repos"), "err", err)
+			log.Fatal("Error pulling repos").Err(err).Send()
-				os.Exit(1)
 		}
 
-			slog.Info(gotext.Get("Done"))
+		log.Info("Done").Send()
 
 		return nil
 	},
 }
-}

gen.go

@@ -1,42 +1,24 @@
-// 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 main
 
 import (
 	"os"
 
-	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
-
+	"plemya-x.ru/alr/pkg/gen"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/gen"
 )
 
-func GenCmd() *cli.Command {
+var genCmd = &cli.Command{
-	return &cli.Command{
 	Name:    "generate",
-		Usage:   gotext.Get("Generate a ALR script from a template"),
+	Usage:   "Generate a ALR script from a template",
 	Aliases: []string{"gen"},
 	Subcommands: []*cli.Command{
-			{
+		genPipCmd,
+	},
+}
+
+var genPipCmd = &cli.Command{
 	Name:  "pip",
-				Usage: gotext.Get("Generate a ALR script for a pip module"),
+	Usage: "Generate a ALR script for a pip module",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:     "name",
@@ -60,7 +42,4 @@ func GenCmd() *cli.Command {
 			Description: c.String("description"),
 		})
 	},
-			},
-		},
-	}
 }

go.mod

@@ -1,40 +1,38 @@
-module gitea.plemya-x.ru/Plemya-x/ALR
+module plemya-x.ru/alr
 
-go 1.22
+go 1.21
 
-toolchain go1.23.5
+toolchain go1.21.3
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/PuerkitoBio/purell v1.2.0
 	github.com/alecthomas/chroma/v2 v2.9.1
-	github.com/charmbracelet/bubbles v0.20.0
+	github.com/charmbracelet/bubbles v0.16.1
-	github.com/charmbracelet/bubbletea v1.2.4
+	github.com/charmbracelet/bubbletea v0.24.2
-	github.com/charmbracelet/lipgloss v1.0.0
+	github.com/charmbracelet/lipgloss v0.8.0
-	github.com/charmbracelet/log v0.4.0
 	github.com/go-git/go-billy/v5 v5.5.0
 	github.com/go-git/go-git/v5 v5.12.0
 	github.com/goreleaser/nfpm/v2 v2.41.0
-	github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08
 	github.com/jmoiron/sqlx v1.3.5
-	github.com/leonelquinteros/gotext v1.7.0
+	github.com/mattn/go-isatty v0.0.19
-	github.com/mattn/go-isatty v0.0.20
 	github.com/mholt/archiver/v4 v4.0.0-alpha.8
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/muesli/reflow v0.3.0
 	github.com/pelletier/go-toml/v2 v2.1.0
-	github.com/schollz/progressbar/v3 v3.18.0
+	github.com/schollz/progressbar/v3 v3.13.1
-	github.com/stretchr/testify v1.10.0
 	github.com/urfave/cli/v2 v2.25.7
 	github.com/vmihailenco/msgpack/v5 v5.3.5
+	go.elara.ws/logger v0.0.0-20230421022458-e80700db2090
+	go.elara.ws/translate v0.0.0-20230421025926-32ccfcd110e6
 	go.elara.ws/vercmp v0.0.0-20230622214216-0b2b067575c4
-	golang.org/x/crypto v0.27.0
+	golang.org/x/crypto v0.23.0
 	golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb
-	golang.org/x/sys v0.29.0
+	golang.org/x/sys v0.20.0
-	golang.org/x/text v0.21.0
+	golang.org/x/text v0.15.0
 	gopkg.in/yaml.v3 v3.0.1
 	modernc.org/sqlite v1.25.0
-	mvdan.cc/sh/v3 v3.10.0
+	mvdan.cc/sh/v3 v3.7.0
 	plemya-x.ru/fakeroot v0.0.0-20240601131003-c638a3543283
 )
 
@@ -53,28 +51,22 @@ require (
 	github.com/bodgit/sevenzip v1.3.0 // indirect
 	github.com/bodgit/windows v1.0.0 // indirect
 	github.com/cavaliergopher/cpio v1.0.1 // indirect
-	github.com/charmbracelet/harmonica v0.2.0 // indirect
-	github.com/charmbracelet/x/ansi v0.4.5 // indirect
-	github.com/charmbracelet/x/term v0.2.1 // indirect
 	github.com/cloudflare/circl v1.3.8 // indirect
 	github.com/connesc/cipherio v0.2.1 // indirect
 	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dlclark/regexp2 v1.10.0 // indirect
 	github.com/dsnet/compress v0.0.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a // indirect
-	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/google/uuid v1.4.0 // indirect
+	github.com/gookit/color v1.5.1 // indirect
 	github.com/goreleaser/chglog v0.6.1 // indirect
 	github.com/goreleaser/fileglob v1.3.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
@@ -87,22 +79,21 @@ require (
 	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-colorable v0.1.2 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
-	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
+	github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/termenv v0.15.2 // indirect
 	github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect
 	github.com/pierrec/lz4/v4 v4.1.15 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/shopspring/decimal v1.2.0 // indirect
@@ -112,14 +103,15 @@ require (
 	github.com/ulikunitz/xz v0.5.12 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
+	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	gitlab.com/digitalxero/go-conventional-commit v1.0.7 // indirect
 	go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
-	golang.org/x/mod v0.18.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
-	golang.org/x/term v0.28.0 // indirect
+	golang.org/x/term v0.20.0 // indirect
-	golang.org/x/tools v0.22.0 // indirect
+	golang.org/x/tools v0.16.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	lukechampine.com/uint128 v1.2.0 // indirect
 	modernc.org/cc/v3 v3.40.0 // indirect

go.sum

@@ -75,34 +75,10 @@ github.com/cavaliergopher/cpio v1.0.1/go.mod h1:pBdaqQjnvXxdS/6CvNDwIANIFSP0xRKI
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/charmbracelet/bubbles v0.16.1 h1:6uzpAAaT9ZqKssntbvZMlksWHruQLNxg49H5WdeuYSY=
 github.com/charmbracelet/bubbles v0.16.1/go.mod h1:2QCp9LFlEsBQMvIYERr7Ww2H2bA7xen1idUDIzm/+Xc=
-github.com/charmbracelet/bubbles v0.20.0 h1:jSZu6qD8cRQ6k9OMfR1WlM+ruM8fkPWkHvQWD9LIutE=
-github.com/charmbracelet/bubbles v0.20.0/go.mod h1:39slydyswPy+uVOHZ5x/GjwVAFkCsV8IIVy+4MhzwwU=
 github.com/charmbracelet/bubbletea v0.24.2 h1:uaQIKx9Ai6Gdh5zpTbGiWpytMU+CfsPp06RaW2cx/SY=
 github.com/charmbracelet/bubbletea v0.24.2/go.mod h1:XdrNrV4J8GiyshTtx3DNuYkR1FDaJmO3l2nejekbsgg=
-github.com/charmbracelet/bubbletea v1.1.0 h1:FjAl9eAL3HBCHenhz/ZPjkKdScmaS5SK69JAK2YJK9c=
+github.com/charmbracelet/lipgloss v0.8.0 h1:IS00fk4XAHcf8uZKc3eHeMUTCxUH6NkaTrdyCQk84RU=
-github.com/charmbracelet/bubbletea v1.1.0/go.mod h1:9Ogk0HrdbHolIKHdjfFpyXJmiCzGwy+FesYkZr7hYU4=
+github.com/charmbracelet/lipgloss v0.8.0/go.mod h1:p4eYUZZJ/0oXTuCQKFF8mqyKCz0ja6y+7DniDDw5KKU=
-github.com/charmbracelet/bubbletea v1.2.4 h1:KN8aCViA0eps9SCOThb2/XPIlea3ANJLUkv3KnQRNCE=
-github.com/charmbracelet/bubbletea v1.2.4/go.mod h1:Qr6fVQw+wX7JkWWkVyXYk/ZUQ92a6XNekLXa3rR18MM=
-github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
-github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
-github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s=
-github.com/charmbracelet/lipgloss v0.10.0/go.mod h1:Wig9DSfvANsxqkRsqj6x87irdy123SR4dOXlKa91ciE=
-github.com/charmbracelet/lipgloss v0.13.0 h1:4X3PPeoWEDCMvzDvGmTajSyYPcZM4+y8sCA/SsA3cjw=
-github.com/charmbracelet/lipgloss v0.13.0/go.mod h1:nw4zy0SBX/F/eAO1cWdcvy6qnkDUxr8Lw7dvFrAIbbY=
-github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
-github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo=
-github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM=
-github.com/charmbracelet/log v0.4.0/go.mod h1:63bXt/djrizTec0l11H20t8FDSvA4CRZJ1KH22MdptM=
-github.com/charmbracelet/x/ansi v0.2.3 h1:VfFN0NUpcjBRd4DnKfRaIRo53KRgey/nhOoEqosGDEY=
-github.com/charmbracelet/x/ansi v0.2.3/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
-github.com/charmbracelet/x/ansi v0.4.5 h1:LqK4vwBNaXw2AyGIICa5/29Sbdq58GbGdFngSexTdRM=
-github.com/charmbracelet/x/ansi v0.4.5/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
-github.com/charmbracelet/x/term v0.2.0 h1:cNB9Ot9q8I711MyZ7myUR5HFWL/lc3OpU8jZ4hwm0x0=
-github.com/charmbracelet/x/term v0.2.0/go.mod h1:GVxgxAbjUrmpvIINHIQnJJKpMlHiZ4cktEQCN6GWyF0=
-github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
-github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
-github.com/chengxilo/virtualterm v1.0.4 h1:Z6IpERbRVlfB8WkOmtbHiDbBANU7cimRIof7mk9/PwM=
-github.com/chengxilo/virtualterm v1.0.4/go.mod h1:DyxxBZz/x1iqJjFxTFcr6/x+jSpqN0iwWCOK1q10rlY=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -117,8 +93,8 @@ github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81/go.mod h1:Yyn
 github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
-github.com/creack/pty v1.1.23 h1:4M6+isWdcStXEf15G/RbrMPOQj1dZ7HPZCGwE4kOeP0=
+github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
-github.com/creack/pty v1.1.23/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
+github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
 github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -137,8 +113,6 @@ github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
-github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE=
@@ -153,10 +127,6 @@ github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZt
 github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
-github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
-github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
-github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
@@ -196,13 +166,13 @@ github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S3
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a h1:JJBdjSfqSy3mnDT0940ASQFghwcZ4y4cb6ttjAoXqwE=
 github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a/go.mod h1:uqVAUVQLq8UY2hCDfmJ/+rtO3aw7qyhc90rCVEabEfI=
-github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
-github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/gookit/color v1.5.1 h1:Vjg2VEcdHpwq+oY63s/ksHrgJYCTo0bwWvmmYWdE9fQ=
+github.com/gookit/color v1.5.1/go.mod h1:wZFzea4X8qN6vHOSP2apMb4/+w/orMznEzYsIHPaqKM=
 github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
 github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
 github.com/goreleaser/chglog v0.6.1 h1:NZKiX8l0FTQPRzBgKST7knvNZmZ04f7PEGkN2wInfhE=
@@ -229,14 +199,13 @@ github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
 github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
-github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 h1:wMeVzrPO3mfHIWLZtDcSaGAe2I4PW9B/P5nMkRSwCAc=
-github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o=
 github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
 github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
@@ -255,26 +224,24 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leonelquinteros/gotext v1.7.0 h1:jcJmF4AXqyamP7vuw2MMIKs+O3jAEmvrc5JQiI8Ht/8=
-github.com/leonelquinteros/gotext v1.7.0/go.mod h1:qJdoQuERPpccw7L70uoU+K/BvTfRBHYsisCQyFLXyvw=
 github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
 github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
+github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
 github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
-github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
 github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
@@ -294,8 +261,6 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b h1:1XF24mVaiu7u+CFywTdcDo2ie1pzzhwjt6RHqzpMU34=
 github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho=
-github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
-github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
 github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
 github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
@@ -322,18 +287,18 @@ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
-github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
 github.com/sassoftware/go-rpmutils v0.4.0 h1:ojND82NYBxgwrV+mX1CWsd5QJvvEZTKddtCdFLPWhpg=
 github.com/sassoftware/go-rpmutils v0.4.0/go.mod h1:3goNWi7PGAT3/dlql2lv3+MSN5jNYPjT5mVcQcIsYzI=
-github.com/schollz/progressbar/v3 v3.18.0 h1:uXdoHABRFmNIjUfte/Ex7WtuyVslrw2wVPQmCN62HpA=
+github.com/schollz/progressbar/v3 v3.13.1 h1:o8rySDYiQ59Mwzy2FELeHY5ZARXZTVJC7iHD6PEFUiE=
-github.com/schollz/progressbar/v3 v3.18.0/go.mod h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec=
+github.com/schollz/progressbar/v3 v3.13.1/go.mod h1:xvrbki8kfT1fzWzBT/UZd9L6GA+jdL7HAgq2RFnO6fQ=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
@@ -352,14 +317,16 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw=
 github.com/therootcompany/xz v1.0.1/go.mod h1:3K3UH1yCKgBneZYhuQUvJ9HPD19UEXEI0BWbMn8qNMY=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
@@ -375,11 +342,17 @@ github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM
 github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
+github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
+github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 gitlab.com/digitalxero/go-conventional-commit v1.0.7 h1:8/dO6WWG+98PMhlZowt/YjuiKhqhGlOCwlIV8SqqGh8=
 gitlab.com/digitalxero/go-conventional-commit v1.0.7/go.mod h1:05Xc2BFsSyC5tKhK0y+P3bs0AwUtNuTp+mTpbCU/DZ0=
+go.elara.ws/logger v0.0.0-20230421022458-e80700db2090 h1:RVC8XvWo6Yw4HUshqx4TSzuBDScDghafU6QFRJ4xPZg=
+go.elara.ws/logger v0.0.0-20230421022458-e80700db2090/go.mod h1:qng49owViqsW5Aey93lwBXONw20oGbJIoLVscB16mPM=
+go.elara.ws/translate v0.0.0-20230421025926-32ccfcd110e6 h1:4xCBxLPBn3Y2DuIcj8zQ1tQOFLrpu6tEIGUWn/Q6zPM=
+go.elara.ws/translate v0.0.0-20230421025926-32ccfcd110e6/go.mod h1:NmfCFqwq7X/aqa/ZVkIysj17JyMEY4Bb5E921kMswNo=
 go.elara.ws/vercmp v0.0.0-20230622214216-0b2b067575c4 h1:Ep54XceQlKhcCHl9awG+wWP4kz4kIP3c3Lzw/Gc/zwY=
 go.elara.ws/vercmp v0.0.0-20230622214216-0b2b067575c4/go.mod h1:/7PNW7nFnDR5W7UXZVc04gdVLR/wBNgkm33KgIz0OBk=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
@@ -397,8 +370,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -428,8 +401,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
-golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -450,8 +423,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -465,8 +438,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -484,9 +457,9 @@ golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -496,15 +469,15 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -515,8 +488,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -545,8 +518,8 @@ golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
+golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM=
-golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
+golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -630,8 +603,8 @@ modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg=
 modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 modernc.org/z v1.7.3 h1:zDJf6iHjrnB+WRD88stbXokugjyc0/pB91ri1gO6LZY=
 modernc.org/z v1.7.3/go.mod h1:Ipv4tsdxZRbQyLq9Q1M6gdbkxYzdlrciF2Hi/lS7nWE=
-mvdan.cc/sh/v3 v3.10.0 h1:v9z7N1DLZ7owyLM/SXZQkBSXcwr2IGMm2LY2pmhVXj4=
+mvdan.cc/sh/v3 v3.7.0 h1:lSTjdP/1xsddtaKfGg7Myu7DnlHItd3/M2tomOcNNBg=
-mvdan.cc/sh/v3 v3.10.0/go.mod h1:z/mSSVyLFGZzqb3ZIKojjyqIx/xbmz/UHdCSv9HmqXY=
+mvdan.cc/sh/v3 v3.7.0/go.mod h1:K2gwkaesF/D7av7Kxl0HbF5kGOd2ArupNTX3X44+8l8=
 plemya-x.ru/fakeroot v0.0.0-20240601131003-c638a3543283 h1:BXCLPeA8g2M6qYngicyxyB/2Bo4J54Q9Rb+8jMmE3ik=
 plemya-x.ru/fakeroot v0.0.0-20240601131003-c638a3543283/go.mod h1:itzL9Jx52VXOhRaucFHuMpa3y7iwjnuLGdNvypoh/S4=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

helper.go

@@ -1,68 +1,35 @@
-// 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 main
 
 import (
 	"fmt"
-	"log/slog"
 	"os"
 	"strings"
 
-	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
+	"plemya-x.ru/alr/internal/cpu"
+	"plemya-x.ru/alr/internal/shutils/helpers"
+	"plemya-x.ru/alr/pkg/distro"
+	"plemya-x.ru/alr/pkg/loggerctx"
 	"mvdan.cc/sh/v3/expand"
 	"mvdan.cc/sh/v3/interp"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/helpers"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 )
 
-func HelperCmd() *cli.Command {
+var helperCmd = &cli.Command{
-	helperListCmd := &cli.Command{
-		Name:    "list",
-		Usage:   gotext.Get("List all the available helper commands"),
-		Aliases: []string{"ls"},
-		Action: func(ctx *cli.Context) error {
-			for name := range helpers.Helpers {
-				fmt.Println(name)
-			}
-			return nil
-		},
-	}
-
-	return &cli.Command{
 	Name:        "helper",
-		Usage:       gotext.Get("Run a ALR helper command"),
+	Usage:       "Run a ALR helper command",
 	ArgsUsage:   `<helper_name|"list">`,
 	Subcommands: []*cli.Command{helperListCmd},
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:    "dest-dir",
 			Aliases: []string{"d"},
-				Usage:   gotext.Get("The directory that the install commands will install to"),
+			Usage:   "The directory that the install commands will install to",
 			Value:   "dest",
 		},
 	},
 	Action: func(c *cli.Context) error {
 		ctx := c.Context
+		log := loggerctx.From(ctx)
 
 		if c.Args().Len() < 1 {
 			cli.ShowSubcommandHelpAndExit(c, 1)
@@ -70,20 +37,17 @@ func HelperCmd() *cli.Command {
 
 		helper, ok := helpers.Helpers[c.Args().First()]
 		if !ok {
-				slog.Error(gotext.Get("No such helper command"), "name", c.Args().First())
+			log.Fatal("No such helper command").Str("name", c.Args().First()).Send()
-				os.Exit(1)
 		}
 
 		wd, err := os.Getwd()
 		if err != nil {
-				slog.Error(gotext.Get("Error getting working directory"), "err", err)
+			log.Fatal("Error getting working directory").Err(err).Send()
-				os.Exit(1)
 		}
 
 		info, err := distro.ParseOSRelease(ctx)
 		if err != nil {
-				slog.Error(gotext.Get("Error getting working directory"), "err", err)
+			log.Fatal("Error getting working directory").Err(err).Send()
-				os.Exit(1)
 		}
 
 		hc := interp.HandlerContext{
@@ -108,4 +72,15 @@ func HelperCmd() *cli.Command {
 		}
 	},
 }
+
+var helperListCmd = &cli.Command{
+	Name:    "list",
+	Usage:   "List all the available helper commands",
+	Aliases: []string{"ls"},
+	Action: func(ctx *cli.Context) error {
+		for name := range helpers.Helpers {
+			fmt.Println(name)
+		}
+		return nil
+	},
 }

info.go

@@ -1,82 +1,64 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// You should have received a copy of the GNU General Public License
+ */
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package main
 
 import (
 	"fmt"
-	"log/slog"
 	"os"
 
-	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
+	"plemya-x.ru/alr/internal/cliutils"
+	"plemya-x.ru/alr/internal/config"
+	"plemya-x.ru/alr/internal/overrides"
+	"plemya-x.ru/alr/pkg/distro"
+	"plemya-x.ru/alr/pkg/loggerctx"
+	"plemya-x.ru/alr/pkg/repos"
 	"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"
-	"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"
 )
 
-func InfoCmd() *cli.Command {
+var infoCmd = &cli.Command{
-	return &cli.Command{
 	Name:  "info",
-		Usage: gotext.Get("Print information about a package"),
+	Usage: "Print information about a package",
 	Flags: []cli.Flag{
 		&cli.BoolFlag{
 			Name:    "all",
 			Aliases: []string{"a"},
-				Usage:   gotext.Get("Show all information, not just for the current distro"),
+			Usage:   "Show all information, not just for the current distro",
 		},
 	},
 	Action: func(c *cli.Context) error {
 		ctx := c.Context
-
+		log := loggerctx.From(ctx)
-			cfg := config.New()
-			db := db.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)
 
 		args := c.Args()
 		if args.Len() < 1 {
-				slog.Error(gotext.Get("Command info expected at least 1 argument, got %d", args.Len()))
+			log.Fatalf("Command info expected at least 1 argument, got %d", args.Len()).Send()
-				os.Exit(1)
 		}
 
-			if cfg.AutoPull(ctx) {
+		err := repos.Pull(ctx, config.Config(ctx).Repos)
-				err := rs.Pull(ctx, cfg.Repos(ctx))
 		if err != nil {
-					slog.Error(gotext.Get("Error pulling repos"), "err", err)
+			log.Fatal("Error pulling repositories").Err(err).Send()
-					os.Exit(1)
-				}
 		}
 
-			found, _, err := rs.FindPkgs(ctx, args.Slice())
+		found, _, err := repos.FindPkgs(ctx, args.Slice())
 		if err != nil {
-				slog.Error(gotext.Get("Error finding packages"), "err", err)
+			log.Fatal("Error finding packages").Err(err).Send()
-				os.Exit(1)
 		}
 
 		if len(found) == 0 {
@@ -91,8 +73,7 @@ func InfoCmd() *cli.Command {
 		if !all {
 			info, err := distro.ParseOSRelease(ctx)
 			if err != nil {
-					slog.Error(gotext.Get("Error parsing os-release file"), "err", err)
+				log.Fatal("Error parsing os-release file").Err(err).Send()
-					os.Exit(1)
 			}
 			names, err = overrides.Resolve(
 				info,
@@ -100,8 +81,7 @@ func InfoCmd() *cli.Command {
 					WithLanguages([]string{config.SystemLang()}),
 			)
 			if err != nil {
-					slog.Error(gotext.Get("Error resolving overrides"), "err", err)
+				log.Fatal("Error resolving overrides").Err(err).Send()
-					os.Exit(1)
 			}
 		}
 
@@ -109,14 +89,12 @@ func InfoCmd() *cli.Command {
 			if !all {
 				err = yaml.NewEncoder(os.Stdout).Encode(overrides.ResolvePackage(&pkg, names))
 				if err != nil {
-						slog.Error(gotext.Get("Error encoding script variables"), "err", err)
+					log.Fatal("Error encoding script variables").Err(err).Send()
-						os.Exit(1)
 				}
 			} else {
 				err = yaml.NewEncoder(os.Stdout).Encode(pkg)
 				if err != nil {
-						slog.Error(gotext.Get("Error encoding script variables"), "err", err)
+					log.Fatal("Error encoding script variables").Err(err).Send()
-						os.Exit(1)
 				}
 			}
 
@@ -126,4 +104,3 @@ func InfoCmd() *cli.Command {
 		return nil
 	},
 }
-}

install.go

@@ -1,45 +1,40 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// You should have received a copy of the GNU General Public License
+ */
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package main
 
 import (
 	"fmt"
-	"log/slog"
-	"os"
 
-	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
-
+	"plemya-x.ru/alr/internal/cliutils"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
+	"plemya-x.ru/alr/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"plemya-x.ru/alr/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"plemya-x.ru/alr/internal/types"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
+	"plemya-x.ru/alr/pkg/build"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
+	"plemya-x.ru/alr/pkg/loggerctx"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
+	"plemya-x.ru/alr/pkg/manager"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
+	"plemya-x.ru/alr/pkg/repos"
 )
 
-func InstallCmd() *cli.Command {
+var installCmd = &cli.Command{
-	return &cli.Command{
 	Name:    "install",
-		Usage:   gotext.Get("Install a new package"),
+	Usage:   "Install a new package",
 	Aliases: []string{"in"},
 	Flags: []cli.Flag{
 		&cli.BoolFlag{
@@ -50,31 +45,26 @@ func InstallCmd() *cli.Command {
 	},
 	Action: func(c *cli.Context) error {
 		ctx := c.Context
+		log := loggerctx.From(ctx)
 
 		args := c.Args()
 		if args.Len() < 1 {
-				slog.Error(gotext.Get("Command install expected at least 1 argument, got %d", args.Len()))
+			log.Fatalf("Command install expected at least 1 argument, got %d", args.Len()).Send()
-				os.Exit(1)
 		}
 
 		mgr := manager.Detect()
 		if mgr == nil {
-				slog.Error(gotext.Get("Unable to detect a supported package manager on the system"))
+			log.Fatal("Unable to detect a supported package manager on the system").Send()
-				os.Exit(1)
 		}
 
-			if config.GetInstance(ctx).AutoPull(ctx) {
 		err := repos.Pull(ctx, config.Config(ctx).Repos)
 		if err != nil {
-					slog.Error(gotext.Get("Error pulling repositories"), "err", err)
+			log.Fatal("Error pulling repositories").Err(err).Send()
-					os.Exit(1)
-				}
 		}
 
 		found, notFound, err := repos.FindPkgs(ctx, args.Slice())
 		if err != nil {
-				slog.Error(gotext.Get("Error finding packages"), "err", err)
+			log.Fatal("Error finding packages").Err(err).Send()
-				os.Exit(1)
 		}
 
 		pkgs := cliutils.FlattenPkgs(ctx, found, "install", c.Bool("interactive"))
@@ -86,10 +76,10 @@ func InstallCmd() *cli.Command {
 		return nil
 	},
 	BashComplete: func(c *cli.Context) {
+		log := loggerctx.From(c.Context)
 		result, err := db.GetPkgs(c.Context, "true")
 		if err != nil {
-				slog.Error(gotext.Get("Error getting packages"), "err", err)
+			log.Fatal("Error getting packages").Err(err).Send()
-				os.Exit(1)
 		}
 		defer result.Close()
 
@@ -97,41 +87,36 @@ func InstallCmd() *cli.Command {
 			var pkg db.Package
 			err = result.StructScan(&pkg)
 			if err != nil {
-					slog.Error(gotext.Get("Error iterating over packages"), "err", err)
+				log.Fatal("Error iterating over packages").Err(err).Send()
-					os.Exit(1)
 			}
 
 			fmt.Println(pkg.Name)
 		}
 	},
 }
-}
 
-func RemoveCmd() *cli.Command {
+var removeCmd = &cli.Command{
-	return &cli.Command{
 	Name:    "remove",
-		Usage:   gotext.Get("Remove an installed package"),
+	Usage:   "Remove an installed package",
 	Aliases: []string{"rm"},
 	Action: func(c *cli.Context) error {
+		log := loggerctx.From(c.Context)
+
 		args := c.Args()
 		if args.Len() < 1 {
-				slog.Error(gotext.Get("Command remove expected at least 1 argument, got %d", args.Len()))
+			log.Fatalf("Command remove expected at least 1 argument, got %d", args.Len()).Send()
-				os.Exit(1)
 		}
 
 		mgr := manager.Detect()
 		if mgr == nil {
-				slog.Error(gotext.Get("Unable to detect a supported package manager on the system"))
+			log.Fatal("Unable to detect a supported package manager on the system").Send()
-				os.Exit(1)
 		}
 
 		err := mgr.Remove(nil, c.Args().Slice()...)
 		if err != nil {
-				slog.Error(gotext.Get("Error removing packages"), "err", err)
+			log.Fatal("Error removing packages").Err(err).Send()
-				os.Exit(1)
 		}
 
 		return nil
 	},
 }
-}

internal/cliutils/prompt.go

@@ -1,35 +1,34 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 (
 	"context"
-	"log/slog"
 	"os"
 	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/leonelquinteros/gotext"
+	"plemya-x.ru/alr/internal/config"
-
+	"plemya-x.ru/alr/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"plemya-x.ru/alr/internal/pager"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/pager"
+	"plemya-x.ru/alr/internal/translations"
+	"plemya-x.ru/alr/pkg/loggerctx"
 )
 
 // YesNoPrompt asks the user a yes or no question, using def as the default answer
@@ -38,7 +37,7 @@ func YesNoPrompt(ctx context.Context, msg string, interactive, def bool) (bool,
 		var answer bool
 		err := survey.AskOne(
 			&survey.Confirm{
-				Message: msg,
+				Message: translations.Translator(ctx).TranslateTo(msg, config.Language(ctx)),
 				Default: def,
 			},
 			&answer,
@@ -53,11 +52,14 @@ func YesNoPrompt(ctx context.Context, msg string, interactive, def bool) (bool,
 // shows it if they answer yes, then asks if they'd still like to
 // continue, and exits if they answer no.
 func PromptViewScript(ctx context.Context, script, name, style string, interactive bool) error {
+	log := loggerctx.From(ctx)
+
 	if !interactive {
 		return nil
 	}
 
-	view, err := YesNoPrompt(ctx, gotext.Get("Would you like to view the build script for %s", name), interactive, false)
+	scriptPrompt := translations.Translator(ctx).TranslateTo("Would you like to view the build script for", config.Language(ctx)) + " " + name
+	view, err := YesNoPrompt(ctx, scriptPrompt, interactive, false)
 	if err != nil {
 		return err
 	}
@@ -68,14 +70,13 @@ func PromptViewScript(ctx context.Context, script, name, style string, interacti
 			return err
 		}
 
-		cont, err := YesNoPrompt(ctx, gotext.Get("Would you still like to continue?"), interactive, false)
+		cont, err := YesNoPrompt(ctx, "Would you still like to continue?", interactive, false)
 		if err != nil {
 			return err
 		}
 
 		if !cont {
-			slog.Error(gotext.Get("User chose not to continue after reading script"))
+			log.Fatal(translations.Translator(ctx).TranslateTo("User chose not to continue after reading script", config.Language(ctx))).Send()
-			os.Exit(1)
 		}
 	}
 
@@ -103,13 +104,13 @@ func ShowScript(path, name, style string) error {
 // FlattenPkgs attempts to flatten the a map of slices of packages into a single slice
 // of packages by prompting the user if multiple packages match.
 func FlattenPkgs(ctx context.Context, found map[string][]db.Package, verb string, interactive bool) []db.Package {
+	log := loggerctx.From(ctx)
 	var outPkgs []db.Package
 	for _, pkgs := range found {
 		if len(pkgs) > 1 && interactive {
 			choice, err := PkgPrompt(ctx, pkgs, verb, interactive)
 			if err != nil {
-				slog.Error(gotext.Get("Error prompting for choice of package"))
+				log.Fatal("Error prompting for choice of package").Send()
-				os.Exit(1)
 			}
 			outPkgs = append(outPkgs, choice)
 		} else if len(pkgs) == 1 || !interactive {
@@ -132,7 +133,7 @@ func PkgPrompt(ctx context.Context, options []db.Package, verb string, interacti
 
 	prompt := &survey.Select{
 		Options: names,
-		Message: gotext.Get("Choose which package to %s", verb),
+		Message: translations.Translator(ctx).TranslateTo("Choose which package to "+verb, config.Language(ctx)),
 	}
 
 	var choice int
@@ -153,7 +154,7 @@ func ChooseOptDepends(ctx context.Context, options []string, verb string, intera
 
 	prompt := &survey.MultiSelect{
 		Options: options,
-		Message: gotext.Get("Choose which optional package(s) to install"),
+		Message: translations.Translator(ctx).TranslateTo("Choose which optional package(s) to install", config.Language(ctx)),
 	}
 
 	var choices []int

internal/config/config.go

@@ -1,36 +1,32 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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"
 	"path/filepath"
 	"sync"
 
 	"github.com/pelletier/go-toml/v2"
-
+	"plemya-x.ru/alr/internal/types"
-	"github.com/leonelquinteros/gotext"
+	"plemya-x.ru/alr/pkg/loggerctx"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 )
 
 type ALRConfig struct {
@@ -45,7 +41,6 @@ var defaultConfig = &types.Config{
 	RootCmd:          "sudo",
 	PagerStyle:       "native",
 	IgnorePkgUpdates: []string{},
-	AutoPull:         true,
 	Repos: []types.Repo{
 		{
 			Name: "default",
@@ -59,9 +54,10 @@ func New() *ALRConfig {
 }
 
 func (c *ALRConfig) Load(ctx context.Context) {
+	log := loggerctx.From(ctx)
 	cfgFl, err := os.Open(c.GetPaths(ctx).ConfigPath)
 	if err != nil {
-		slog.Warn(gotext.Get("Error opening config file, using defaults"), "err", err)
+		log.Warn("Error opening config file, using defaults").Err(err).Send()
 		c.cfg = defaultConfig
 		return
 	}
@@ -74,28 +70,27 @@ func (c *ALRConfig) Load(ctx context.Context) {
 
 	err = toml.NewDecoder(cfgFl).Decode(config)
 	if err != nil {
-		slog.Warn(gotext.Get("Error decoding config file, using defaults"), "err", err)
+		log.Warn("Error decoding config file, using defaults").Err(err).Send()
 		c.cfg = defaultConfig
 		return
 	}
 	c.cfg = config
 }
 
-func (c *ALRConfig) initPaths() {
+func (c *ALRConfig) initPaths(ctx context.Context) {
+	log := loggerctx.From(ctx)
 	paths := &Paths{}
 
 	cfgDir, err := os.UserConfigDir()
 	if err != nil {
-		slog.Error(gotext.Get("Unable to detect user config directory"), "err", err)
+		log.Fatal("Unable to detect user config directory").Err(err).Send()
-		os.Exit(1)
 	}
 
 	paths.ConfigDir = filepath.Join(cfgDir, "alr")
 
 	err = os.MkdirAll(paths.ConfigDir, 0o755)
 	if err != nil {
-		slog.Error(gotext.Get("Unable to create ALR config directory"), "err", err)
+		log.Fatal("Unable to create ALR config directory").Err(err).Send()
-		os.Exit(1)
 	}
 
 	paths.ConfigPath = filepath.Join(paths.ConfigDir, "alr.toml")
@@ -103,14 +98,12 @@ func (c *ALRConfig) initPaths() {
 	if _, err := os.Stat(paths.ConfigPath); err != nil {
 		cfgFl, err := os.Create(paths.ConfigPath)
 		if err != nil {
-			slog.Error(gotext.Get("Unable to create ALR config file"), "err", err)
+			log.Fatal("Unable to create ALR config file").Err(err).Send()
-			os.Exit(1)
 		}
 
 		err = toml.NewEncoder(cfgFl).Encode(&defaultConfig)
 		if err != nil {
-			slog.Error(gotext.Get("Error encoding default configuration"), "err", err)
+			log.Fatal("Error encoding default configuration").Err(err).Send()
-			os.Exit(1)
 		}
 
 		cfgFl.Close()
@@ -118,8 +111,7 @@ func (c *ALRConfig) initPaths() {
 
 	cacheDir, err := os.UserCacheDir()
 	if err != nil {
-		slog.Error(gotext.Get("Unable to detect cache directory"), "err", err)
+		log.Fatal("Unable to detect cache directory").Err(err).Send()
-		os.Exit(1)
 	}
 
 	paths.CacheDir = filepath.Join(cacheDir, "alr")
@@ -128,14 +120,12 @@ func (c *ALRConfig) initPaths() {
 
 	err = os.MkdirAll(paths.RepoDir, 0o755)
 	if err != nil {
-		slog.Error(gotext.Get("Unable to create repo cache directory"), "err", err)
+		log.Fatal("Unable to create repo cache directory").Err(err).Send()
-		os.Exit(1)
 	}
 
 	err = os.MkdirAll(paths.PkgsDir, 0o755)
 	if err != nil {
-		slog.Error(gotext.Get("Unable to create package cache directory"), "err", err)
+		log.Fatal("Unable to create package cache directory").Err(err).Send()
-		os.Exit(1)
 	}
 
 	paths.DBPath = filepath.Join(paths.CacheDir, "db")
@@ -145,7 +135,7 @@ func (c *ALRConfig) initPaths() {
 
 func (c *ALRConfig) GetPaths(ctx context.Context) *Paths {
 	c.pathsOnce.Do(func() {
-		c.initPaths()
+		c.initPaths(ctx)
 	})
 	return c.paths
 }
@@ -163,10 +153,3 @@ func (c *ALRConfig) IgnorePkgUpdates(ctx context.Context) []string {
 	})
 	return c.cfg.IgnorePkgUpdates
 }
-
-func (c *ALRConfig) AutoPull(ctx context.Context) bool {
-	c.cfgOnce.Do(func() {
-		c.Load(ctx)
-	})
-	return c.cfg.AutoPull
-}

internal/config/config_legacy.go

@@ -1,18 +1,20 @@
-// ALR - Any Linux Repository
+/*
-// Copyright (C) 2025 Евгений Храмов
+ * ALR - Any Linux Repository
-//
+ * Copyright (C) 2024 Евгений Храмов
-// 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
+ * This program is free software: you can redistribute it and/or modify
-// the Free Software Foundation, either version 3 of the License, or
+ * it under the terms of the GNU General Public License as published by
-// (at your option) any later version.
+ * 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
+ * This program is distributed in the hope that it will be useful,
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// GNU General Public License for more details.
+ * 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/>.
+ * 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
 
@@ -20,7 +22,7 @@ import (
 	"context"
 	"sync"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
+	"plemya-x.ru/alr/internal/types"
 )
 
 // Config returns a ALR configuration struct.

internal/config/lang.go

@@ -1,32 +1,30 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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"
+	"plemya-x.ru/alr/pkg/loggerctx"
 	"golang.org/x/text/language"
 )
 
@@ -43,12 +41,12 @@ var (
 func Language(ctx context.Context) language.Tag {
 	langMtx.Lock()
 	defer langMtx.Unlock()
+	log := loggerctx.From(ctx)
 	if !langSet {
 		syslang := SystemLang()
 		tag, err := language.Parse(syslang)
 		if err != nil {
-			slog.Error(gotext.Get("Error parsing system language"), "err", err)
+			log.Fatal("Error parsing system language").Err(err).Send()
-			os.Exit(1)
 		}
 		base, _ := tag.Base()
 		lang = language.Make(base.String())

internal/config/paths.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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
 

internal/config/version.go

@@ -1,22 +1,3 @@
-// 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
 
 // Version contains the version of ALR. If the version

internal/cpu/cpu.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 cpu
 

internal/db/db.go

@@ -1,32 +1,29 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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"
 
 	"github.com/jmoiron/sqlx"
-	"github.com/leonelquinteros/gotext"
+	"plemya-x.ru/alr/internal/config"
-
+	"plemya-x.ru/alr/pkg/loggerctx"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
 )
 
 // CurrentVersion is the current version of the database.
@@ -95,6 +92,7 @@ func (d *Database) GetConn() *sqlx.DB {
 }
 
 func (d *Database) initDB(ctx context.Context) error {
+	log := loggerctx.From(ctx)
 	d.conn = d.conn.Unsafe()
 	conn := d.conn
 	_, err := conn.ExecContext(ctx, `
@@ -128,11 +126,11 @@ func (d *Database) initDB(ctx context.Context) error {
 
 	ver, ok := d.GetVersion(ctx)
 	if ok && ver != CurrentVersion {
-		slog.Warn(gotext.Get("Database version mismatch; resetting"), "version", ver, "expected", CurrentVersion)
+		log.Warn("Database version mismatch; resetting").Int("version", ver).Int("expected", CurrentVersion).Send()
 		d.reset(ctx)
 		return d.initDB(ctx)
 	} else if !ok {
-		slog.Warn(gotext.Get("Database version does not exist. Run alr fix if something isn't working."), "version", ver, "expected", CurrentVersion)
+		log.Warn("Database version does not exist. Run alr fix if something isn't working.").Send()
 		return d.addVersion(ctx, CurrentVersion)
 	}
 

internal/db/db_legacy.go

@@ -1,31 +1,30 @@
-// ALR - Any Linux Repository
+/*
-// Copyright (C) 2025 Евгений Храмов
+ * ALR - Any Linux Repository
-//
+ * Copyright (C) 2024 Евгений Храмов
-// 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
+ * This program is free software: you can redistribute it and/or modify
-// the Free Software Foundation, either version 3 of the License, or
+ * it under the terms of the GNU General Public License as published by
-// (at your option) any later version.
+ * 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
+ * This program is distributed in the hope that it will be useful,
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// GNU General Public License for more details.
+ * 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/>.
+ * 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"
+	"plemya-x.ru/alr/internal/config"
-
+	"plemya-x.ru/alr/pkg/loggerctx"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
 )
 
 // DB returns the ALR database.
@@ -94,12 +93,12 @@ var (
 // Deprecated: For legacy only
 func GetInstance(ctx context.Context) *Database {
 	dbOnce.Do(func() {
+		log := loggerctx.From(ctx)
 		cfg := config.GetInstance(ctx)
 		database = New(cfg)
 		err := database.Init(ctx)
 		if err != nil {
-			slog.Error(gotext.Get("Error opening database"), "err", err)
+			log.Fatal("Error opening database").Err(err).Send()
-			os.Exit(1)
 		}
 	})
 	return database

internal/db/db_test.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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_test
 
@@ -26,9 +25,8 @@ import (
 	"testing"
 
 	"github.com/jmoiron/sqlx"
-
+	"plemya-x.ru/alr/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"plemya-x.ru/alr/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 )
 
 type TestALRConfig struct{}

internal/db/json.go

@@ -1,19 +1,3 @@
-// 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 (

internal/db/utils.go

@@ -1,19 +1,3 @@
-// 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 (

internal/dl/dl.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+* the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+* (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+* GNU General Public License for more details.
-// 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/>.
-// You should have received a copy of the GNU General Public License
+ */
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Пакет dl содержит абстракции для загрузки файлов и каталогов
 // из различных источников.
@@ -31,20 +30,18 @@ import (
 	"fmt"
 	"hash"
 	"io"
-	"log/slog"
 	"os"
 	"path/filepath"
 	"strings"
 
 	"github.com/PuerkitoBio/purell"
-	"github.com/leonelquinteros/gotext"
 	"github.com/vmihailenco/msgpack/v5"
 	"golang.org/x/crypto/blake2b"
 	"golang.org/x/crypto/blake2s"
 	"golang.org/x/exp/slices"
-
+	"plemya-x.ru/alr/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"plemya-x.ru/alr/internal/dlcache"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/dlcache"
+	"plemya-x.ru/alr/pkg/loggerctx"
 )
 
 // Константа для имени файла манифеста кэша
@@ -134,7 +131,7 @@ type Manifest struct {
 type Downloader interface {
 	Name() string
 	MatchURL(string) bool
-	Download(context.Context, Options) (Type, string, error)
+	Download(Options) (Type, string, error)
 }
 
 // Интерфейс UpdatingDownloader расширяет Downloader методом Update
@@ -145,6 +142,7 @@ type UpdatingDownloader interface {
 
 // Функция Download загружает файл или каталог с использованием указанных параметров
 func Download(ctx context.Context, opts Options) (err error) {
+	log := loggerctx.From(ctx)
 	cfg := config.GetInstance(ctx)
 	dc := dlcache.New(cfg)
 
@@ -157,7 +155,7 @@ func Download(ctx context.Context, opts Options) (err error) {
 	d := getDownloader(opts.URL)
 
 	if opts.CacheDisabled {
-		_, _, err = d.Download(ctx, opts)
+		_, _, err = d.Download(opts)
 		return err
 	}
 
@@ -166,11 +164,7 @@ func Download(ctx context.Context, opts Options) (err error) {
 	if ok {
 		var updated bool
 		if d, ok := d.(UpdatingDownloader); ok {
-			slog.Info(
+			log.Info("Source can be updated, updating if required").Str("source", opts.Name).Str("downloader", d.Name()).Send()
-				gotext.Get("Source can be updated, updating if required"),
-				"source", opts.Name,
-				"downloader", d.Name(),
-			)
 
 			updated, err = d.Update(Options{
 				Hash:          opts.Hash,
@@ -197,18 +191,10 @@ func Download(ctx context.Context, opts Options) (err error) {
 			}
 
 			if ok && !updated {
-				slog.Info(
+				log.Info("Source found in cache and linked to destination").Str("source", opts.Name).Stringer("type", t).Send()
-					gotext.Get("Source found in cache and linked to destination"),
-					"source", opts.Name,
-					"type", t,
-				)
 				return nil
 			} else if ok {
-				slog.Info(
+				log.Info("Source updated and linked to destination").Str("source", opts.Name).Stringer("type", t).Send()
-					gotext.Get("Source updated and linked to destination"),
-					"source", opts.Name,
-					"type", t,
-				)
 				return nil
 			}
 		} else {
@@ -219,14 +205,14 @@ func Download(ctx context.Context, opts Options) (err error) {
 		}
 	}
 
-	slog.Info(gotext.Get("Downloading source"), "source", opts.Name, "downloader", d.Name())
+	log.Info("Downloading source").Str("source", opts.Name).Str("downloader", d.Name()).Send()
 
 	cacheDir, err = dc.New(ctx, opts.URL)
 	if err != nil {
 		return err
 	}
 
-	t, name, err := d.Download(ctx, Options{
+	t, name, err := d.Download(Options{
 		Hash:          opts.Hash,
 		HashAlgorithm: opts.HashAlgorithm,
 		Name:          opts.Name,

internal/dl/file.go

@@ -1,28 +1,26 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 dl
 
 import (
 	"bytes"
 	"context"
-	"fmt"
 	"io"
 	"mime"
 	"net/http"
@@ -31,8 +29,11 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/mholt/archiver/v4"
+	"github.com/schollz/progressbar/v3"
+	"plemya-x.ru/alr/internal/shutils/handlers"
 )
 
 // FileDownloader загружает файлы с использованием HTTP
@@ -51,7 +52,7 @@ func (FileDownloader) MatchURL(string) bool {
 
 // Download загружает файл с использованием HTTP. Если файл
 // сжат в поддерживаемом формате, он будет распакован
-func (FileDownloader) Download(ctx context.Context, opts Options) (Type, string, error) {
+func (FileDownloader) Download(opts Options) (Type, string, error) {
 	// Разбор URL
 	u, err := url.Parse(opts.URL)
 	if err != nil {
@@ -91,12 +92,8 @@ func (FileDownloader) Download(ctx context.Context, opts Options) (Type, string,
 		}
 		r = localFl
 	} else {
-		req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)
-		if err != nil {
-			return 0, "", fmt.Errorf("failed to create request: %w", err)
-		}
 		// Выполнение HTTP GET запроса
-		res, err := http.DefaultClient.Do(req)
+		res, err := http.Get(u.String())
 		if err != nil {
 			return 0, "", err
 		}
@@ -115,13 +112,29 @@ func (FileDownloader) Download(ctx context.Context, opts Options) (Type, string,
 	if err != nil {
 		return 0, "", err
 	}
+	defer fl.Close()
 
-	var out io.WriteCloser
+	var bar io.WriteCloser
 	// Настройка индикатора прогресса
 	if opts.Progress != nil {
-		out = NewProgressWriter(fl, size, name, opts.Progress)
+		bar = progressbar.NewOptions64(
+			size,
+			progressbar.OptionSetDescription(name),
+			progressbar.OptionSetWriter(opts.Progress),
+			progressbar.OptionShowBytes(true),
+			progressbar.OptionSetWidth(10),
+			progressbar.OptionThrottle(65*time.Millisecond),
+			progressbar.OptionShowCount(),
+			progressbar.OptionOnCompletion(func() {
+				_, _ = io.WriteString(opts.Progress, "\n")
+			}),
+			progressbar.OptionSpinnerType(14),
+			progressbar.OptionFullWidth(),
+			progressbar.OptionSetRenderBlankState(true),
+		)
+		defer bar.Close()
 	} else {
-		out = fl
+		bar = handlers.NopRWC{}
 	}
 
 	h, err := opts.NewHash()
@@ -132,9 +145,9 @@ func (FileDownloader) Download(ctx context.Context, opts Options) (Type, string,
 	var w io.Writer
 	// Настройка MultiWriter для записи в файл, хеш и индикатор прогресса
 	if opts.Hash != nil {
-		w = io.MultiWriter(h, out)
+		w = io.MultiWriter(fl, h, bar)
 	} else {
-		w = io.MultiWriter(out)
+		w = io.MultiWriter(fl, bar)
 	}
 
 	// Копирование содержимого из источника в файл назначения
@@ -143,7 +156,6 @@ func (FileDownloader) Download(ctx context.Context, opts Options) (Type, string,
 		return 0, "", err
 	}
 	r.Close()
-	out.Close()
 
 	// Проверка контрольной суммы
 	if opts.Hash != nil {

internal/dl/git.go

@@ -1,26 +1,24 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 dl
 
 import (
-	"context"
 	"errors"
 	"net/url"
 	"path"
@@ -48,7 +46,7 @@ func (GitDownloader) MatchURL(u string) bool {
 // Download uses git to clone the repository from the specified URL.
 // It allows specifying the revision, depth and recursion options
 // via query string
-func (GitDownloader) Download(ctx context.Context, opts Options) (Type, string, error) {
+func (GitDownloader) Download(opts Options) (Type, string, error) {
 	u, err := url.Parse(opts.URL)
 	if err != nil {
 		return 0, "", err
@@ -90,7 +88,7 @@ func (GitDownloader) Download(ctx context.Context, opts Options) (Type, string,
 		co.RecurseSubmodules = git.DefaultSubmoduleRecursionDepth
 	}
 
-	r, err := git.PlainCloneContext(ctx, opts.Destination, false, co)
+	r, err := git.PlainClone(opts.Destination, false, co)
 	if err != nil {
 		return 0, "", err
 	}

internal/dl/progress_tui.go

@@ -1,247 +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 dl
-
-import (
-	"fmt"
-	"io"
-	"math"
-	"os"
-	"time"
-
-	"github.com/charmbracelet/bubbles/progress"
-	"github.com/charmbracelet/bubbles/spinner"
-	tea "github.com/charmbracelet/bubbletea"
-	"github.com/leonelquinteros/gotext"
-)
-
-type model struct {
-	progress   progress.Model
-	spinner    spinner.Model
-	percent    float64
-	speed      float64
-	done       bool
-	useSpinner bool
-	filename   string
-
-	total      int64
-	downloaded int64
-	elapsed    time.Duration
-	remaining  time.Duration
-
-	width int
-}
-
-func (m model) Init() tea.Cmd {
-	if m.useSpinner {
-		return m.spinner.Tick
-	}
-	return nil
-}
-
-func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	if m.done {
-		return m, tea.Quit
-	}
-
-	switch msg := msg.(type) {
-	case progressUpdate:
-		m.percent = msg.percent
-		m.speed = msg.speed
-		m.downloaded = msg.downloaded
-		m.total = msg.total
-		m.elapsed = time.Duration(msg.elapsed) * time.Second
-		m.remaining = time.Duration(msg.remaining) * time.Second
-		if m.percent >= 1.0 {
-			m.done = true
-			return m, tea.Quit
-		}
-		return m, nil
-	case tea.WindowSizeMsg:
-		m.width = msg.Width
-		return m, nil
-	case progress.FrameMsg:
-		if !m.useSpinner {
-			progressModel, cmd := m.progress.Update(msg)
-			m.progress = progressModel.(progress.Model)
-			return m, cmd
-		}
-	case spinner.TickMsg:
-		if m.useSpinner {
-			spinnerModel, cmd := m.spinner.Update(msg)
-			m.spinner = spinnerModel
-			return m, cmd
-		}
-	case tea.KeyMsg:
-		if msg.String() == "q" {
-			return m, tea.Quit
-		}
-	}
-
-	return m, nil
-}
-
-func (m model) View() string {
-	if m.done {
-		return gotext.Get("%s: done!\n", m.filename)
-	}
-	if m.useSpinner {
-		return gotext.Get(
-			"%s %s downloading at %s/s\n",
-			m.filename,
-			m.spinner.View(),
-			prettyByteSize(int64(m.speed)),
-		)
-	}
-
-	leftPart := m.filename
-
-	rightPart := fmt.Sprintf("%.2f%% (%s/%s, %s/s) [%v:%v]\n", m.percent*100,
-		prettyByteSize(m.downloaded),
-		prettyByteSize(m.total),
-		prettyByteSize(int64(m.speed)),
-		m.elapsed,
-		m.remaining,
-	)
-
-	m.progress.Width = m.width - len(leftPart) - len(rightPart) - 6
-	bar := m.progress.ViewAs(m.percent)
-	return fmt.Sprintf(
-		"%s %s %s",
-		leftPart,
-		bar,
-		rightPart,
-	)
-}
-
-func prettyByteSize(b int64) string {
-	bf := float64(b)
-	for _, unit := range []string{"", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"} {
-		if math.Abs(bf) < 1024.0 {
-			return fmt.Sprintf("%3.1f%sB", bf, unit)
-		}
-		bf /= 1024.0
-	}
-	return fmt.Sprintf("%.1fYiB", bf)
-}
-
-type progressUpdate struct {
-	percent float64
-	speed   float64
-	total   int64
-
-	downloaded int64
-	elapsed    float64
-	remaining  float64
-}
-
-type ProgressWriter struct {
-	baseWriter   io.WriteCloser
-	total        int64
-	downloaded   int64
-	startTime    time.Time
-	onProgress   func(progressUpdate)
-	lastReported time.Time
-	doneChan     chan struct{}
-}
-
-func (pw *ProgressWriter) Write(p []byte) (int, error) {
-	n, err := pw.baseWriter.Write(p)
-	if err != nil {
-		return n, err
-	}
-
-	pw.downloaded += int64(n)
-	now := time.Now()
-	elapsed := now.Sub(pw.startTime).Seconds()
-	speed := float64(pw.downloaded) / elapsed
-	var remaining, percent float64
-	if pw.total > 0 {
-		remaining = (float64(pw.total) - float64(pw.downloaded)) / speed
-		percent = float64(pw.downloaded) / float64(pw.total)
-	}
-
-	if now.Sub(pw.lastReported) > 100*time.Millisecond {
-		pw.onProgress(progressUpdate{
-			percent:    percent,
-			speed:      speed,
-			total:      pw.total,
-			downloaded: pw.downloaded,
-			elapsed:    elapsed,
-			remaining:  remaining,
-		})
-		pw.lastReported = now
-	}
-
-	return n, nil
-}
-
-func (pw *ProgressWriter) Close() error {
-	pw.onProgress(progressUpdate{
-		percent:    1,
-		speed:      0,
-		downloaded: pw.downloaded,
-	})
-	<-pw.doneChan
-	return nil
-}
-
-func NewProgressWriter(base io.WriteCloser, max int64, filename string, out io.Writer) *ProgressWriter {
-	var m *model
-	if max == -1 {
-		m = &model{
-			spinner:    spinner.New(),
-			useSpinner: true,
-			filename:   filename,
-		}
-		m.spinner.Spinner = spinner.Dot
-	} else {
-		m = &model{
-			progress: progress.New(
-				progress.WithDefaultGradient(),
-				progress.WithoutPercentage(),
-			),
-			useSpinner: false,
-			filename:   filename,
-		}
-	}
-
-	p := tea.NewProgram(m,
-		tea.WithInput(nil),
-		tea.WithOutput(out),
-	)
-
-	pw := &ProgressWriter{
-		baseWriter: base,
-		total:      max,
-		startTime:  time.Now(),
-		doneChan:   make(chan struct{}),
-		onProgress: func(update progressUpdate) {
-			p.Send(update)
-		},
-	}
-
-	go func() {
-		defer close(pw.doneChan)
-		if _, err := p.Run(); err != nil {
-			fmt.Fprintf(os.Stderr, "Error running progress writer: %v\n", err)
-			os.Exit(1)
-		}
-	}()
-
-	return pw
-}

internal/dl/torrent.go

@@ -1,26 +1,6 @@
-// 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 dl
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -50,7 +30,7 @@ func (TorrentDownloader) MatchURL(u string) bool {
 }
 
 // Download downloads a file over the BitTorrent protocol.
-func (TorrentDownloader) Download(ctx context.Context, opts Options) (Type, string, error) {
+func (TorrentDownloader) Download(opts Options) (Type, string, error) {
 	aria2Path, err := exec.LookPath("aria2c")
 	if err != nil {
 		return 0, "", ErrAria2NotFound
@@ -58,7 +38,7 @@ func (TorrentDownloader) Download(ctx context.Context, opts Options) (Type, stri
 
 	opts.URL = strings.TrimPrefix(opts.URL, "torrent+")
 
-	cmd := exec.CommandContext(ctx, aria2Path, "--summary-interval=0", "--log-level=warn", "--seed-time=0", "--dir="+opts.Destination, opts.URL)
+	cmd := exec.Command(aria2Path, "--summary-interval=0", "--log-level=warn", "--seed-time=0", "--dir="+opts.Destination, opts.URL)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err = cmd.Run()

internal/dlcache/dlcache.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 dlcache
 
@@ -24,7 +23,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"plemya-x.ru/alr/internal/config"
 )
 
 type Config interface {

internal/dlcache/dlcache_test.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 dlcache_test
 
@@ -28,8 +27,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"plemya-x.ru/alr/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/dlcache"
+	"plemya-x.ru/alr/internal/dlcache"
 )
 
 func init() {

internal/dlcache/utils.go

@@ -1,19 +1,3 @@
-// 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 dlcache
 
 import (

internal/logger/log.go

@@ -1,96 +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 logger
-
-import (
-	"context"
-	"log/slog"
-	"os"
-
-	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/log"
-	"github.com/leonelquinteros/gotext"
-)
-
-type Logger struct {
-	lOut slog.Handler
-	lErr slog.Handler
-}
-
-func setupOutLogger() *log.Logger {
-	styles := log.DefaultStyles()
-	logger := log.New(os.Stdout)
-	styles.Levels[log.InfoLevel] = lipgloss.NewStyle().
-		SetString("-->").
-		Foreground(lipgloss.Color("35"))
-	logger.SetStyles(styles)
-	return logger
-}
-
-func setupErrorLogger() *log.Logger {
-	styles := log.DefaultStyles()
-	styles.Levels[log.ErrorLevel] = lipgloss.NewStyle().
-		SetString(gotext.Get("ERROR")).
-		Padding(0, 1, 0, 1).
-		Background(lipgloss.Color("204")).
-		Foreground(lipgloss.Color("0"))
-	logger := log.New(os.Stderr)
-	logger.SetStyles(styles)
-	return logger
-}
-
-func New() *Logger {
-	standardLogger := setupOutLogger()
-	errLogger := setupErrorLogger()
-	return &Logger{
-		lOut: standardLogger,
-		lErr: errLogger,
-	}
-}
-
-func (l *Logger) Enabled(ctx context.Context, level slog.Level) bool {
-	if level <= slog.LevelInfo {
-		return l.lOut.Enabled(ctx, level)
-	}
-	return l.lErr.Enabled(ctx, level)
-}
-
-func (l *Logger) Handle(ctx context.Context, rec slog.Record) error {
-	if rec.Level <= slog.LevelInfo {
-		return l.lOut.Handle(ctx, rec)
-	}
-	return l.lErr.Handle(ctx, rec)
-}
-
-func (l *Logger) WithAttrs(attrs []slog.Attr) slog.Handler {
-	sl := *l
-	sl.lOut = l.lOut.WithAttrs(attrs)
-	sl.lErr = l.lErr.WithAttrs(attrs)
-	return &sl
-}
-
-func (l *Logger) WithGroup(name string) slog.Handler {
-	sl := *l
-	sl.lOut = l.lOut.WithGroup(name)
-	sl.lErr = l.lErr.WithGroup(name)
-	return &sl
-}
-
-func SetupDefault() {
-	logger := slog.New(New())
-	slog.SetDefault(logger)
-}

internal/osutils/move.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 osutils
 

internal/overrides/overrides.go

@@ -1,36 +1,32 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 overrides
 
 import (
-	"fmt"
 	"reflect"
-	"regexp"
 	"strings"
 
+	"plemya-x.ru/alr/internal/cpu"
+	"plemya-x.ru/alr/internal/db"
+	"plemya-x.ru/alr/pkg/distro"
 	"golang.org/x/exp/slices"
 	"golang.org/x/text/language"
-
-	"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/pkg/distro"
 )
 
 type Opts struct {
@@ -225,19 +221,3 @@ func parseLangs(langs []string, tags []language.Tag) ([]string, error) {
 	out = slices.Compact(out)
 	return out, nil
 }
-
-func ReleasePlatformSpecific(release int, info *distro.OSRelease) string {
-	if info.ID == "altlinux" {
-		return fmt.Sprintf("alt%d", release)
-	}
-
-	if info.ID == "fedora" || slices.Contains(info.Like, "fedora") {
-		re := regexp.MustCompile(`platform:(\S+)`)
-		match := re.FindStringSubmatch(info.PlatformID)
-		if len(match) > 1 {
-			return fmt.Sprintf("%d.%s", release, match[1])
-		}
-	}
-
-	return fmt.Sprintf("%d", release)
-}

internal/overrides/overrides_test.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 overrides_test
 
@@ -24,11 +23,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"plemya-x.ru/alr/internal/overrides"
+	"plemya-x.ru/alr/pkg/distro"
 	"golang.org/x/text/language"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 )
 
 var info = &distro.OSRelease{
@@ -196,42 +193,3 @@ func TestResolveLangs(t *testing.T) {
 		t.Errorf("expected %v, got %v", expected, names)
 	}
 }
-
-func TestReleasePlatformSpecific(t *testing.T) {
-	type testCase struct {
-		info     *distro.OSRelease
-		expected string
-	}
-
-	for _, tc := range []testCase{
-		{
-			info: &distro.OSRelease{
-				ID:         "centos",
-				Like:       []string{"rhel", "fedora"},
-				PlatformID: "platform:el8",
-			},
-			expected: "1.el8",
-		},
-		{
-			info: &distro.OSRelease{
-				ID:         "fedora",
-				PlatformID: "platform:f42",
-			},
-			expected: "1.f42",
-		},
-		{
-			info: &distro.OSRelease{
-				ID: "altlinux",
-			},
-			expected: "alt1",
-		},
-		{
-			info: &distro.OSRelease{
-				ID: "ubuntu",
-			},
-			expected: "1",
-		},
-	} {
-		assert.Equal(t, tc.expected, overrides.ReleasePlatformSpecific(1, tc.info))
-	}
-}

internal/pager/highlighting.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 pager
 

internal/pager/pager.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 pager
 

internal/shutils/decoder/decoder.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 decoder
 
@@ -26,13 +25,12 @@ import (
 	"strings"
 
 	"github.com/mitchellh/mapstructure"
+	"plemya-x.ru/alr/internal/overrides"
+	"plemya-x.ru/alr/pkg/distro"
 	"golang.org/x/exp/slices"
 	"mvdan.cc/sh/v3/expand"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 )
 
 var ErrNotPointerToStruct = errors.New("val must be a pointer to a struct")
@@ -177,35 +175,7 @@ func (d *Decoder) GetFunc(name string) (ScriptFunc, bool) {
 	return func(ctx context.Context, opts ...interp.RunnerOption) error {
 		sub := d.Runner.Subshell()
 		for _, opt := range opts {
-			err := opt(sub)
+			opt(sub)
-			if err != nil {
-				return err
-			}
-		}
-		return sub.Run(ctx, fn)
-	}, true
-}
-
-type PrepareFunc func(context.Context, *interp.Runner) error
-
-func (d *Decoder) GetFuncP(name string, prepare PrepareFunc) (ScriptFunc, bool) {
-	fn := d.getFunc(name)
-	if fn == nil {
-		return nil, false
-	}
-
-	return func(ctx context.Context, opts ...interp.RunnerOption) error {
-		sub := d.Runner.Subshell()
-		for _, opt := range opts {
-			err := opt(sub)
-			if err != nil {
-				return err
-			}
-		}
-		if prepare != nil {
-			if err := prepare(ctx, sub); err != nil {
-				return err
-			}
 		}
 		return sub.Run(ctx, fn)
 	}, true
@@ -251,8 +221,3 @@ func (d *Decoder) getVar(name string) *expand.Variable {
 	}
 	return nil
 }
-
-func IsTruthy(value string) bool {
-	value = strings.ToLower(strings.TrimSpace(value))
-	return value == "true" || value == "yes" || value == "1"
-}

internal/shutils/decoder/decoder_test.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 decoder_test
 
@@ -30,9 +29,8 @@ import (
 
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
-
+	"plemya-x.ru/alr/internal/shutils/decoder"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder"
+	"plemya-x.ru/alr/pkg/distro"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 )
 
 type BuildVars struct {

internal/shutils/handlers/exec.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 handlers
 

internal/shutils/handlers/exec_test.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 handlers_test
 
@@ -26,10 +25,9 @@ import (
 
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
-
+	"plemya-x.ru/alr/internal/shutils/decoder"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder"
+	"plemya-x.ru/alr/internal/shutils/handlers"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
+	"plemya-x.ru/alr/pkg/distro"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 )
 
 const testScript = `

internal/shutils/handlers/fakeroot.go

@@ -1,22 +1,3 @@
-// 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 handlers
 
 import (
@@ -29,9 +10,9 @@ import (
 	"syscall"
 	"time"
 
+	"plemya-x.ru/fakeroot"
 	"mvdan.cc/sh/v3/expand"
 	"mvdan.cc/sh/v3/interp"
-	"plemya-x.ru/fakeroot"
 )
 
 // FakerootExecHandler was extracted from github.com/mvdan/sh/interp/handler.go

internal/shutils/handlers/nop.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 handlers
 

internal/shutils/handlers/nop_test.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 handlers_test
 
@@ -26,10 +25,9 @@ import (
 	"strings"
 	"testing"
 
+	"plemya-x.ru/alr/internal/shutils/handlers"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
 )
 
 func TestNopExec(t *testing.T) {

internal/shutils/handlers/restricted.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 handlers
 

internal/shutils/helpers/helpers.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 helpers
 
@@ -24,7 +23,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"path"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -33,9 +31,8 @@ import (
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"
 	"golang.org/x/exp/slices"
+	"plemya-x.ru/alr/internal/shutils/handlers"
 	"mvdan.cc/sh/v3/interp"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
 )
 
 var (
@@ -56,17 +53,12 @@ var Helpers = handlers.ExecFuncs{
 	"install-completion":   installCompletionCmd,
 	"install-library":      installLibraryCmd,
 	"git-version":          gitVersionCmd,
-
-	"files-find-lang": filesFindLangCmd,
-	"files-find-doc":  filesFindDocCmd,
 }
 
 // Restricted contains restricted read-only helper commands
 // that don't modify any state
 var Restricted = handlers.ExecFuncs{
 	"git-version": gitVersionCmd,
-	"files-find-lang": filesFindLangCmd,
-	"files-find-doc":  filesFindDocCmd,
 }
 
 func installHelperCmd(prefix string, perms os.FileMode) handlers.ExecFunc {
@@ -262,114 +254,6 @@ func gitVersionCmd(hc interp.HandlerContext, cmd string, args []string) error {
 	return nil
 }
 
-func filesFindLangCmd(hc interp.HandlerContext, cmd string, args []string) error {
-	namePattern := "*.mo"
-	if len(args) > 0 {
-		namePattern = args[0] + ".mo"
-	}
-
-	localePath := "./usr/share/locale/"
-	realPath := path.Join(hc.Dir, localePath)
-
-	info, err := os.Stat(realPath)
-	if err != nil {
-		return fmt.Errorf("files-find-lang: %w", err)
-	}
-	if !info.IsDir() {
-		return fmt.Errorf("files-find-lang: %s is not a directory", localePath)
-	}
-
-	var langFiles []string
-	err = filepath.Walk(realPath, func(p string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		if !info.IsDir() && matchNamePattern(info.Name(), namePattern) {
-			relPath, relErr := filepath.Rel(hc.Dir, p)
-			if relErr != nil {
-				return relErr
-			}
-			langFiles = append(langFiles, "./"+relPath)
-		}
-		return nil
-	})
-	if err != nil {
-		return fmt.Errorf("files-find-lang: %w", err)
-	}
-
-	for _, file := range langFiles {
-		fmt.Fprintln(hc.Stdout, file)
-	}
-
-	return nil
-}
-
-func filesFindDocCmd(hc interp.HandlerContext, cmd string, args []string) error {
-	namePattern := "*"
-	if len(args) > 0 {
-		namePattern = args[0]
-	}
-
-	docPath := "./usr/share/doc/"
-	docRealPath := path.Join(hc.Dir, docPath)
-
-	info, err := os.Stat(docRealPath)
-	if err != nil {
-		return fmt.Errorf("files-find-doc: %w", err)
-	}
-	if !info.IsDir() {
-		return fmt.Errorf("files-find-doc: %s is not a directory", docPath)
-	}
-
-	var docFiles []string
-
-	entries, err := os.ReadDir(docRealPath)
-	if err != nil {
-		return err
-	}
-	for _, entry := range entries {
-		if matchNamePattern(entry.Name(), namePattern) {
-			targetPath := filepath.Join(docRealPath, entry.Name())
-			targetInfo, err := os.Stat(targetPath)
-			if err != nil {
-				return err
-			}
-			if targetInfo.IsDir() {
-				err := filepath.Walk(targetPath, func(subPath string, subInfo os.FileInfo, subErr error) error {
-					relPath, err := filepath.Rel(hc.Dir, subPath)
-					if err != nil {
-						return err
-					}
-					docFiles = append(docFiles, "./"+relPath)
-					return nil
-				})
-				if err != nil {
-					return err
-				}
-			}
-		}
-	}
-
-	if err != nil {
-		return fmt.Errorf("files-find-doc: %w", err)
-	}
-
-	for _, file := range docFiles {
-		fmt.Fprintln(hc.Stdout, file)
-	}
-
-	return nil
-}
-
-func matchNamePattern(name, pattern string) bool {
-	matched, err := filepath.Match(pattern, name)
-	if err != nil {
-		return false
-	}
-	return matched
-}
-
 func helperInstall(from, to string, perms os.FileMode) error {
 	err := os.MkdirAll(filepath.Dir(to), 0o755)
 	if err != nil {

internal/shutils/helpers/helpers_internal_test.go

@@ -1,216 +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 helpers
-
-import (
-	"bytes"
-	"context"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"mvdan.cc/sh/v3/interp"
-	"mvdan.cc/sh/v3/syntax"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
-)
-
-type testCase struct {
-	name           string
-	dirsToCreate   []string
-	filesToCreate  []string
-	expectedOutput []string
-	args           string
-}
-
-func TestFindFilesDoc(t *testing.T) {
-	tests := []testCase{
-		{
-			name: "All dirs",
-			dirsToCreate: []string{
-				"usr/share/doc/yandex-browser-stable/subdir",
-				"usr/share/doc/firefox",
-			},
-			filesToCreate: []string{
-				"usr/share/doc/yandex-browser-stable/README.md",
-				"usr/share/doc/yandex-browser-stable/subdir/nested-file.txt",
-				"usr/share/doc/firefox/README.md",
-			},
-			expectedOutput: []string{
-				"./usr/share/doc/yandex-browser-stable",
-				"./usr/share/doc/yandex-browser-stable/README.md",
-				"./usr/share/doc/yandex-browser-stable/subdir",
-				"./usr/share/doc/yandex-browser-stable/subdir/nested-file.txt",
-				"./usr/share/doc/firefox",
-				"./usr/share/doc/firefox/README.md",
-			},
-			args: "",
-		},
-		{
-			name: "Only selected dir",
-			dirsToCreate: []string{
-				"usr/share/doc/yandex-browser-stable/subdir",
-				"usr/share/doc/firefox",
-				"usr/share/doc/foo/yandex-browser-stable",
-			},
-			filesToCreate: []string{
-				"usr/share/doc/yandex-browser-stable/README.md",
-				"usr/share/doc/yandex-browser-stable/subdir/nested-file.txt",
-				"usr/share/doc/firefox/README.md",
-				"usr/share/doc/firefox/yandex-browser-stable",
-				"usr/share/doc/foo/yandex-browser-stable/README.md",
-			},
-			expectedOutput: []string{
-				"./usr/share/doc/yandex-browser-stable",
-				"./usr/share/doc/yandex-browser-stable/README.md",
-				"./usr/share/doc/yandex-browser-stable/subdir",
-				"./usr/share/doc/yandex-browser-stable/subdir/nested-file.txt",
-			},
-			args: "yandex-browser-stable",
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			tempDir, err := os.MkdirTemp("", "test-files-find-doc")
-			assert.NoError(t, err)
-			defer os.RemoveAll(tempDir)
-
-			for _, dir := range tc.dirsToCreate {
-				dirPath := filepath.Join(tempDir, dir)
-				err := os.MkdirAll(dirPath, 0o755)
-				assert.NoError(t, err)
-			}
-
-			for _, file := range tc.filesToCreate {
-				filePath := filepath.Join(tempDir, file)
-				err := os.WriteFile(filePath, []byte("test content"), 0o644)
-				assert.NoError(t, err)
-			}
-
-			helpers := handlers.ExecFuncs{
-				"files-find-doc": filesFindDocCmd,
-			}
-			buf := &bytes.Buffer{}
-			runner, err := interp.New(
-				interp.Dir(tempDir),
-				interp.StdIO(os.Stdin, buf, os.Stderr),
-				interp.ExecHandler(helpers.ExecHandler(interp.DefaultExecHandler(1000))),
-			)
-			assert.NoError(t, err)
-
-			scriptContent := `
-shopt -s globstar
-files-find-doc ` + tc.args
-
-			script, err := syntax.NewParser().Parse(strings.NewReader(scriptContent), "")
-			assert.NoError(t, err)
-
-			err = runner.Run(context.Background(), script)
-			assert.NoError(t, err)
-
-			contents := strings.Fields(strings.TrimSpace(buf.String()))
-			assert.ElementsMatch(t, tc.expectedOutput, contents)
-		})
-	}
-}
-
-func TestFindLang(t *testing.T) {
-	tests := []testCase{
-		{
-			name: "All dirs",
-			dirsToCreate: []string{
-				"usr/share/locale/ru/LC_MESSAGES",
-				"usr/share/locale/tr/LC_MESSAGES",
-			},
-			filesToCreate: []string{
-				"usr/share/locale/ru/LC_MESSAGES/yandex-disk.mo",
-				"usr/share/locale/ru/LC_MESSAGES/yandex-disk-indicator.mo",
-				"usr/share/locale/tr/LC_MESSAGES/yandex-disk.mo",
-			},
-			expectedOutput: []string{
-				"./usr/share/locale/ru/LC_MESSAGES/yandex-disk.mo",
-				"./usr/share/locale/ru/LC_MESSAGES/yandex-disk-indicator.mo",
-				"./usr/share/locale/tr/LC_MESSAGES/yandex-disk.mo",
-			},
-			args: "",
-		},
-		{
-			name: "All dirs",
-			dirsToCreate: []string{
-				"usr/share/locale/ru/LC_MESSAGES",
-				"usr/share/locale/tr/LC_MESSAGES",
-			},
-			filesToCreate: []string{
-				"usr/share/locale/ru/LC_MESSAGES/yandex-disk.mo",
-				"usr/share/locale/ru/LC_MESSAGES/yandex-disk-indicator.mo",
-				"usr/share/locale/tr/LC_MESSAGES/yandex-disk.mo",
-			},
-			expectedOutput: []string{
-				"./usr/share/locale/ru/LC_MESSAGES/yandex-disk.mo",
-				"./usr/share/locale/tr/LC_MESSAGES/yandex-disk.mo",
-			},
-			args: "yandex-disk",
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			tempDir, err := os.MkdirTemp("", "test-files-find-lang")
-			assert.NoError(t, err)
-			defer os.RemoveAll(tempDir)
-
-			for _, dir := range tc.dirsToCreate {
-				dirPath := filepath.Join(tempDir, dir)
-				err := os.MkdirAll(dirPath, 0o755)
-				assert.NoError(t, err)
-			}
-
-			for _, file := range tc.filesToCreate {
-				filePath := filepath.Join(tempDir, file)
-				err := os.WriteFile(filePath, []byte("test content"), 0o644)
-				assert.NoError(t, err)
-			}
-
-			helpers := handlers.ExecFuncs{
-				"files-find-lang": filesFindLangCmd,
-			}
-			buf := &bytes.Buffer{}
-			runner, err := interp.New(
-				interp.Dir(tempDir),
-				interp.StdIO(os.Stdin, buf, os.Stderr),
-				interp.ExecHandler(helpers.ExecHandler(interp.DefaultExecHandler(1000))),
-			)
-			assert.NoError(t, err)
-
-			scriptContent := `
-shopt -s globstar
-files-find-lang ` + tc.args
-
-			script, err := syntax.NewParser().Parse(strings.NewReader(scriptContent), "")
-			assert.NoError(t, err)
-
-			err = runner.Run(context.Background(), script)
-			assert.NoError(t, err)
-
-			contents := strings.Fields(strings.TrimSpace(buf.String()))
-			assert.ElementsMatch(t, tc.expectedOutput, contents)
-		})
-	}
-}

internal/translations/default.pot

@@ -1,466 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: build.go:41
-msgid "Build a local package"
-msgstr ""
-
-#: build.go:47
-msgid "Path to the build script"
-msgstr ""
-
-#: build.go:52
-msgid "Name of the package to build and its repo (example: default/go-bin)"
-msgstr ""
-
-#: build.go:57
-msgid ""
-"Build package from scratch even if there's an already built package available"
-msgstr ""
-
-#: build.go:80
-msgid "Error pulling repositories"
-msgstr ""
-
-#: build.go:87
-msgid "Unable to detect a supported package manager on the system"
-msgstr ""
-
-#: build.go:98
-msgid "Error building package"
-msgstr ""
-
-#: build.go:104
-msgid "Error getting working directory"
-msgstr ""
-
-#: build.go:112
-msgid "Error moving the package"
-msgstr ""
-
-#: fix.go:37
-msgid "Attempt to fix problems with ALR"
-msgstr ""
-
-#: fix.go:44
-msgid "Removing cache directory"
-msgstr ""
-
-#: fix.go:48
-msgid "Unable to remove cache directory"
-msgstr ""
-
-#: fix.go:52
-msgid "Rebuilding cache"
-msgstr ""
-
-#: fix.go:56
-msgid "Unable to create new cache directory"
-msgstr ""
-
-#: fix.go:62
-msgid "Error pulling repos"
-msgstr ""
-
-#: fix.go:66
-msgid "Done"
-msgstr ""
-
-#: gen.go:34
-msgid "Generate a ALR script from a template"
-msgstr ""
-
-#: gen.go:39
-msgid "Generate a ALR script for a pip module"
-msgstr ""
-
-#: helper.go:41
-msgid "List all the available helper commands"
-msgstr ""
-
-#: helper.go:53
-msgid "Run a ALR helper command"
-msgstr ""
-
-#: helper.go:60
-msgid "The directory that the install commands will install to"
-msgstr ""
-
-#: helper.go:73
-msgid "No such helper command"
-msgstr ""
-
-#: info.go:42
-msgid "Print information about a package"
-msgstr ""
-
-#: info.go:47
-msgid "Show all information, not just for the current distro"
-msgstr ""
-
-#: info.go:57
-msgid "Error initialization database"
-msgstr ""
-
-#: info.go:64
-msgid "Command info expected at least 1 argument, got %d"
-msgstr ""
-
-#: info.go:78
-msgid "Error finding packages"
-msgstr ""
-
-#: info.go:94
-msgid "Error parsing os-release file"
-msgstr ""
-
-#: info.go:103
-msgid "Error resolving overrides"
-msgstr ""
-
-#: info.go:112 info.go:118
-msgid "Error encoding script variables"
-msgstr ""
-
-#: install.go:42
-msgid "Install a new package"
-msgstr ""
-
-#: install.go:56
-msgid "Command install expected at least 1 argument, got %d"
-msgstr ""
-
-#: install.go:91
-msgid "Error getting packages"
-msgstr ""
-
-#: install.go:100
-msgid "Error iterating over packages"
-msgstr ""
-
-#: install.go:113
-msgid "Remove an installed package"
-msgstr ""
-
-#: install.go:118
-msgid "Command remove expected at least 1 argument, got %d"
-msgstr ""
-
-#: install.go:130
-msgid "Error removing packages"
-msgstr ""
-
-#: internal/cliutils/prompt.go:60
-msgid "Would you like to view the build script for %s"
-msgstr ""
-
-#: internal/cliutils/prompt.go:71
-msgid "Would you still like to continue?"
-msgstr ""
-
-#: internal/cliutils/prompt.go:77
-msgid "User chose not to continue after reading script"
-msgstr ""
-
-#: internal/cliutils/prompt.go:111
-msgid "Error prompting for choice of package"
-msgstr ""
-
-#: internal/cliutils/prompt.go:135
-msgid "Choose which package to %s"
-msgstr ""
-
-#: internal/cliutils/prompt.go:156
-msgid "Choose which optional package(s) to install"
-msgstr ""
-
-#: internal/config/config.go:64
-msgid "Error opening config file, using defaults"
-msgstr ""
-
-#: internal/config/config.go:77
-msgid "Error decoding config file, using defaults"
-msgstr ""
-
-#: internal/config/config.go:89
-msgid "Unable to detect user config directory"
-msgstr ""
-
-#: internal/config/config.go:97
-msgid "Unable to create ALR config directory"
-msgstr ""
-
-#: internal/config/config.go:106
-msgid "Unable to create ALR config file"
-msgstr ""
-
-#: internal/config/config.go:112
-msgid "Error encoding default configuration"
-msgstr ""
-
-#: internal/config/config.go:121
-msgid "Unable to detect cache directory"
-msgstr ""
-
-#: internal/config/config.go:131
-msgid "Unable to create repo cache directory"
-msgstr ""
-
-#: internal/config/config.go:137
-msgid "Unable to create package cache directory"
-msgstr ""
-
-#: internal/config/lang.go:50
-msgid "Error parsing system language"
-msgstr ""
-
-#: internal/db/db.go:131
-msgid "Database version mismatch; resetting"
-msgstr ""
-
-#: internal/db/db.go:135
-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 ""
-
-#: internal/dl/dl.go:201
-msgid "Source found in cache and linked to destination"
-msgstr ""
-
-#: internal/dl/dl.go:208
-msgid "Source updated and linked to destination"
-msgstr ""
-
-#: internal/dl/dl.go:222
-msgid "Downloading source"
-msgstr ""
-
-#: internal/dl/progress_tui.go:100
-msgid "%s: done!\n"
-msgstr ""
-
-#: internal/dl/progress_tui.go:104
-msgid "%s %s downloading at %s/s\n"
-msgstr ""
-
-#: internal/logger/log.go:47
-msgid "ERROR"
-msgstr ""
-
-#: list.go:40
-msgid "List ALR repo packages"
-msgstr ""
-
-#: list.go:91
-msgid "Error listing installed packages"
-msgstr ""
-
-#: main.go:45
-msgid "Print the current ALR version and exit"
-msgstr ""
-
-#: main.go:61
-msgid "Arguments to be passed on to the package manager"
-msgstr ""
-
-#: main.go:67
-msgid "Enable interactive questions and prompts"
-msgstr ""
-
-#: main.go:90
-msgid ""
-"Running ALR as root is forbidden as it may cause catastrophic damage to your "
-"system"
-msgstr ""
-
-#: main.go:124
-msgid "Error while running app"
-msgstr ""
-
-#: pkg/build/build.go:107
-msgid "Failed to prompt user to view build script"
-msgstr ""
-
-#: pkg/build/build.go:111
-msgid "Building package"
-msgstr ""
-
-#: pkg/build/build.go:155
-msgid "Downloading sources"
-msgstr ""
-
-#: pkg/build/build.go:167
-msgid "Building package metadata"
-msgstr ""
-
-#: pkg/build/build.go:189
-msgid "Compressing package"
-msgstr ""
-
-#: pkg/build/build.go:315
-msgid ""
-"Your system's CPU architecture doesn't match this package. Do you want to "
-"build anyway?"
-msgstr ""
-
-#: pkg/build/build.go:326
-msgid "This package is already installed"
-msgstr ""
-
-#: pkg/build/build.go:354
-msgid "Installing build dependencies"
-msgstr ""
-
-#: pkg/build/build.go:396
-msgid "Installing dependencies"
-msgstr ""
-
-#: pkg/build/build.go:442
-msgid "Executing version()"
-msgstr ""
-
-#: pkg/build/build.go:462
-msgid "Updating version"
-msgstr ""
-
-#: pkg/build/build.go:467
-msgid "Executing prepare()"
-msgstr ""
-
-#: pkg/build/build.go:477
-msgid "Executing build()"
-msgstr ""
-
-#: pkg/build/build.go:489
-msgid "Executing package()"
-msgstr ""
-
-#: pkg/build/build.go:527
-msgid "Executing files()"
-msgstr ""
-
-#: pkg/build/build.go:605
-msgid "AutoProv is not implemented for this package format, so it's skipped"
-msgstr ""
-
-#: pkg/build/build.go:616
-msgid "AutoReq is not implemented for this package format, so it's skipped"
-msgstr ""
-
-#: pkg/build/build.go:723
-msgid "Would you like to remove the build dependencies?"
-msgstr ""
-
-#: pkg/build/build.go:829
-msgid "The checksums array must be the same length as sources"
-msgstr ""
-
-#: pkg/build/findDeps.go:35
-msgid "Command not found on the system"
-msgstr ""
-
-#: pkg/build/findDeps.go:82
-msgid "Provided dependency found"
-msgstr ""
-
-#: pkg/build/findDeps.go:89
-msgid "Required dependency found"
-msgstr ""
-
-#: pkg/build/install.go:42
-msgid "Error installing native packages"
-msgstr ""
-
-#: pkg/build/install.go:79
-msgid "Error installing package"
-msgstr ""
-
-#: pkg/repos/pull.go:75
-msgid "Pulling repository"
-msgstr ""
-
-#: pkg/repos/pull.go:99
-msgid "Repository up to date"
-msgstr ""
-
-#: pkg/repos/pull.go:156
-msgid "Git repository does not appear to be a valid ALR repo"
-msgstr ""
-
-#: pkg/repos/pull.go:172
-msgid ""
-"ALR repo's minimum ALR version is greater than the current version. Try "
-"updating ALR if something doesn't work."
-msgstr ""
-
-#: repo.go:41
-msgid "Add a new repository"
-msgstr ""
-
-#: repo.go:48
-msgid "Name of the new repo"
-msgstr ""
-
-#: repo.go:54
-msgid "URL of the new repo"
-msgstr ""
-
-#: repo.go:79 repo.go:136
-msgid "Error opening config file"
-msgstr ""
-
-#: repo.go:85 repo.go:142
-msgid "Error encoding config"
-msgstr ""
-
-#: repo.go:103
-msgid "Remove an existing repository"
-msgstr ""
-
-#: repo.go:110
-msgid "Name of the repo to be deleted"
-msgstr ""
-
-#: repo.go:128
-msgid "Repo does not exist"
-msgstr ""
-
-#: repo.go:148
-msgid "Error removing repo directory"
-msgstr ""
-
-#: repo.go:154
-msgid "Error removing packages from database"
-msgstr ""
-
-#: repo.go:166
-msgid "Pull all repositories that have changed"
-msgstr ""
-
-#: upgrade.go:47
-msgid "Upgrade all installed packages"
-msgstr ""
-
-#: upgrade.go:83
-msgid "Error checking for updates"
-msgstr ""
-
-#: upgrade.go:94
-msgid "There is nothing to do."
-msgstr ""

internal/translations/files/lure.en.toml

@@ -0,0 +1,155 @@
+[[translation]]
+id = 1228660974
+value = 'Pulling repository'
+
+[[translation]]
+id = 2779805870
+value = 'Repository up to date'
+
+[[translation]]
+id = 1433222829
+value = 'Would you like to view the build script for'
+
+[[translation]]
+id = 2470847050
+value = 'Failed to prompt user to view build script'
+
+[[translation]]
+id = 855659503
+value = 'Would you still like to continue?'
+
+[[translation]]
+id = 1997041569
+value = 'User chose not to continue after reading script'
+
+[[translation]]
+id = 2347700990
+value = 'Building package'
+
+[[translation]]
+id = 2105058868
+value = 'Downloading sources'
+
+[[translation]]
+id = 1884485082
+value = 'Downloading source'
+
+[[translation]]
+id = 1519177982
+value = 'Error building package'
+
+[[translation]]
+id = 2125220917
+value = 'Choose which package(s) to install'
+
+[[translation]]
+id = 812531604
+value = 'Error prompting for choice of package'
+
+[[translation]]
+id = 1040982801
+value = 'Updating version'
+
+[[translation]]
+id = 1014897988
+value = 'Remove build dependencies?'
+
+[[translation]]
+id = 2205430948
+value = 'Installing build dependencies'
+
+[[translation]]
+id = 2522710805
+value = 'Installing dependencies'
+
+[[translation]]
+id = 3602138206
+value = 'Error installing package'
+
+[[translation]]
+id = 2235794125
+value = 'Would you like to remove build dependencies?'
+
+[[translation]]
+id = 2562049386
+value = "Your system's CPU architecture doesn't match this package. Do you want to build anyway?"
+
+[[translation]]
+id = 4006393493
+value = 'The checksums array must be the same length as sources'
+
+[[translation]]
+id = 3759891273
+value = 'The package() function is required'
+
+[[translation]]
+id = 1057080231
+value = 'Executing package()'
+
+[[translation]]
+id = 2687735200
+value = 'Executing prepare()'
+
+[[translation]]
+id = 535572372
+value = 'Executing version()'
+
+[[translation]]
+id = 436644691
+value = 'Executing build()'
+
+[[translation]]
+id = 1393316459
+value = 'This package is already installed'
+
+[[translation]]
+id = 1267660189
+value = 'Source can be updated, updating if required'
+
+[[translation]]
+id = 21753247
+value = 'Source found in cache, linked to destination'
+
+[[translation]]
+id = 257354570
+value = 'Compressing package'
+
+[[translation]]
+id = 2952487371
+value = 'Building package metadata'
+
+[[translation]]
+id = 3121791194
+value = 'Running ALR as root is forbidden as it may cause catastrophic damage to your system'
+
+[[translation]]
+id = 1256604213
+value = 'Waiting for torrent metadata'
+
+[[translation]]
+id = 432261354
+value = 'Downloading torrent file'
+
+[[translation]]
+id = 1579384326
+value = 'name'
+
+[[translation]]
+id = 3206337475
+value = 'version'
+
+[[translation]]
+id = 1810056261
+value = 'new'
+
+[[translation]]
+id = 1602912115
+value = 'source'
+
+[[translation]]
+id = 2363381545
+value = 'type'
+
+[[translation]]
+id = 3419504365
+value = 'downloader'

internal/translations/files/lure.ru.toml

@@ -0,0 +1,151 @@
+[[translation]]
+id = 1228660974
+value = 'Скачивание репозитория'
+
+[[translation]]
+id = 2779805870
+value = 'Репозиторий уже обновлен'
+
+[[translation]]
+id = 1433222829
+value = 'Показать скрипт для пакета'
+
+[[translation]]
+id = 2470847050
+value = 'Не удалось предложить просмотреть скрипт'
+
+[[translation]]
+id = 855659503
+value = 'Продолжить?'
+
+[[translation]]
+id = 1997041569
+value = 'Пользователь решил не продолжать после просмотра скрипта'
+
+[[translation]]
+id = 2347700990
+value = 'Сборка пакета'
+
+[[translation]]
+id = 2105058868
+value = 'Скачивание файлов'
+
+[[translation]]
+id = 1884485082
+value = 'Скачивание источника'
+
+[[translation]]
+id = 1519177982
+value = 'Ошибка при сборке пакета'
+
+[[translation]]
+id = 2125220917
+value = 'Выберите, какие пакеты установить'
+
+[[translation]]
+id = 812531604
+value = 'Ошибка при запросе выбора пакета'
+
+[[translation]]
+id = 1040982801
+value = 'Обновление версии'
+
+[[translation]]
+id = 2235794125
+value = 'Удалить зависимости сборки?'
+
+[[translation]]
+id = 2205430948
+value = 'Установка зависимостей сборки'
+
+[[translation]]
+id = 2522710805
+value = 'Установка зависимостей'
+
+[[translation]]
+id = 3602138206
+value = 'Ошибка при установке пакета'
+
+[[translation]]
+id = 1057080231
+value = 'Вызов функции package()'
+
+[[translation]]
+id = 2687735200
+value = 'Вызов функции prepare()'
+
+[[translation]]
+id = 535572372
+value = 'Вызов функции version()'
+
+[[translation]]
+id = 436644691
+value = 'Вызов функции build()'
+
+[[translation]]
+id = 2562049386
+value = "Архитектура процессора вашей системы не соответствует этому пакету. Продолжать несмотря на это?"
+
+[[translation]]
+id = 3759891273
+value = 'Функция package() необходима'
+
+[[translation]]
+id = 4006393493
+value = 'Массив checksums должен быть той же длины, что и sources'
+
+[[translation]]
+id = 1393316459
+value = 'Этот пакет уже установлен'
+
+[[translation]]
+id = 1267660189
+value = 'Источник может быть обновлен, если требуется, обновляем'
+
+[[translation]]
+id = 21753247
+value = 'Источник найден в кэше'
+
+[[translation]]
+id = 257354570
+value = 'Сжатие пакета'
+
+[[translation]]
+id = 2952487371
+value = 'Создание метаданных пакета'
+
+[[translation]]
+id = 3121791194
+value = 'Запуск ALR от имени root запрещен, так как это может привести к катастрофическому повреждению вашей системы'
+
+[[translation]]
+id = 1256604213
+value = 'Ожидание метаданных торрента'
+
+[[translation]]
+id = 432261354
+value = 'Скачивание торрент-файла'
+
+[[translation]]
+id = 1579384326
+value = 'название'
+
+[[translation]]
+id = 3206337475
+value = 'версия'
+
+[[translation]]
+id = 1810056261
+value = 'новая'
+
+[[translation]]
+id = 1602912115
+value = 'источник'
+
+[[translation]]
+id = 2363381545
+value = 'вид'
+
+[[translation]]
+id = 3419504365
+value = 'протокол-скачивание'

internal/translations/po/ru/default.po

@@ -1,486 +0,0 @@
-#
-# Maxim Slipenko <maks1ms@alt-gnome.ru>, 2025.
-# x1z53 <x1z53@yandex.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"
-"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"
-"X-Generator: Gtranslator 47.1\n"
-
-#: build.go:41
-msgid "Build a local package"
-msgstr "Сборка локального пакета"
-
-#: build.go:47
-msgid "Path to the build script"
-msgstr "Путь к скрипту сборки"
-
-#: build.go:52
-msgid "Name of the package to build and its repo (example: default/go-bin)"
-msgstr "Имя пакета для сборки и его репозиторий (пример: default/go-bin)"
-
-#: build.go:57
-msgid ""
-"Build package from scratch even if there's an already built package available"
-msgstr "Создайте пакет с нуля, даже если уже имеется готовый пакет"
-
-#: build.go:80
-msgid "Error pulling repositories"
-msgstr "Ошибка при извлечении репозиториев"
-
-#: build.go:87
-msgid "Unable to detect a supported package manager on the system"
-msgstr "Не удалось обнаружить поддерживаемый менеджер пакетов в системе"
-
-#: build.go:98
-msgid "Error building package"
-msgstr "Ошибка при сборке пакета"
-
-#: build.go:104
-msgid "Error getting working directory"
-msgstr "Ошибка при получении рабочего каталога"
-
-#: build.go:112
-msgid "Error moving the package"
-msgstr "Ошибка при перемещении пакета"
-
-#: fix.go:37
-msgid "Attempt to fix problems with ALR"
-msgstr "Попытка устранить проблемы с ALR"
-
-#: fix.go:44
-msgid "Removing cache directory"
-msgstr "Удаление каталога кэша"
-
-#: fix.go:48
-msgid "Unable to remove cache directory"
-msgstr "Не удалось удалить каталог кэша"
-
-#: fix.go:52
-msgid "Rebuilding cache"
-msgstr "Восстановление кэша"
-
-#: fix.go:56
-msgid "Unable to create new cache directory"
-msgstr "Не удалось создать новый каталог кэша"
-
-#: fix.go:62
-msgid "Error pulling repos"
-msgstr "Ошибка при извлечении репозиториев"
-
-#: fix.go:66
-msgid "Done"
-msgstr "Сделано"
-
-#: gen.go:34
-msgid "Generate a ALR script from a template"
-msgstr "Генерация скрипта ALR из шаблона"
-
-#: gen.go:39
-msgid "Generate a ALR script for a pip module"
-msgstr "Генерация скрипта ALR для модуля pip"
-
-#: helper.go:41
-msgid "List all the available helper commands"
-msgstr "Список всех доступных вспомогательных команды"
-
-#: helper.go:53
-msgid "Run a ALR helper command"
-msgstr "Запустить вспомогательную команду ALR"
-
-#: helper.go:60
-msgid "The directory that the install commands will install to"
-msgstr "Каталог, в который будут устанавливать команды установки"
-
-#: helper.go:73
-msgid "No such helper command"
-msgstr "Такой вспомогательной команды нет"
-
-#: info.go:42
-msgid "Print information about a package"
-msgstr "Отобразить информацию о пакете"
-
-#: info.go:47
-msgid "Show all information, not just for the current distro"
-msgstr "Показывать всю информацию, не только для текущего дистрибутива"
-
-#: info.go:57
-msgid "Error initialization database"
-msgstr "Ошибка инициализации базы данных"
-
-#: info.go:64
-msgid "Command info expected at least 1 argument, got %d"
-msgstr "Для команды info ожидался хотя бы 1 аргумент, получено %d"
-
-#: info.go:78
-msgid "Error finding packages"
-msgstr "Ошибка при поиске пакетов"
-
-#: info.go:94
-msgid "Error parsing os-release file"
-msgstr "Ошибка при разборе файла выпуска операционной системы"
-
-#: info.go:103
-msgid "Error resolving overrides"
-msgstr "Ошибка устранения переорпеделений"
-
-#: info.go:112 info.go:118
-msgid "Error encoding script variables"
-msgstr "Ошибка кодирования переменных скрита"
-
-#: install.go:42
-msgid "Install a new package"
-msgstr "Установить новый пакет"
-
-#: install.go:56
-msgid "Command install expected at least 1 argument, got %d"
-msgstr "Для команды install ожидался хотя бы 1 аргумент, получено %d"
-
-#: install.go:91
-msgid "Error getting packages"
-msgstr "Ошибка при получении пакетов"
-
-#: install.go:100
-msgid "Error iterating over packages"
-msgstr "Ошибка при переборе пакетов"
-
-#: install.go:113
-msgid "Remove an installed package"
-msgstr "Удалить установленный пакет"
-
-#: install.go:118
-msgid "Command remove expected at least 1 argument, got %d"
-msgstr "Для команды remove ожидался хотя бы 1 аргумент, получено %d"
-
-#: install.go:130
-msgid "Error removing packages"
-msgstr "Ошибка при удалении пакетов"
-
-#: internal/cliutils/prompt.go:60
-msgid "Would you like to view the build script for %s"
-msgstr "Показать скрипт для пакета %s"
-
-#: internal/cliutils/prompt.go:71
-msgid "Would you still like to continue?"
-msgstr "Продолжить?"
-
-#: internal/cliutils/prompt.go:77
-msgid "User chose not to continue after reading script"
-msgstr "Пользователь решил не продолжать после просмотра скрипта"
-
-#: internal/cliutils/prompt.go:111
-msgid "Error prompting for choice of package"
-msgstr "Ошибка при запросе выбора пакета"
-
-#: internal/cliutils/prompt.go:135
-msgid "Choose which package to %s"
-msgstr "Выберите, какой пакет использовать для %s"
-
-#: internal/cliutils/prompt.go:156
-msgid "Choose which optional package(s) to install"
-msgstr "Выберите, какой дополнительный пакет(ы) следует установить"
-
-#: internal/config/config.go:64
-msgid "Error opening config file, using defaults"
-msgstr ""
-"Ошибка при открытии конфигурационного файла, используются значения по "
-"умолчанию"
-
-#: internal/config/config.go:77
-msgid "Error decoding config file, using defaults"
-msgstr ""
-"Ошибка при декодировании конфигурационного файла, используются значения по "
-"умолчанию"
-
-#: internal/config/config.go:89
-msgid "Unable to detect user config directory"
-msgstr "Не удалось обнаружить каталог конфигурации пользователя"
-
-#: internal/config/config.go:97
-msgid "Unable to create ALR config directory"
-msgstr "Не удалось создать каталог конфигурации ALR"
-
-#: internal/config/config.go:106
-msgid "Unable to create ALR config file"
-msgstr "Не удалось создать конфигурационный файл ALR"
-
-#: internal/config/config.go:112
-msgid "Error encoding default configuration"
-msgstr "Ошибка кодирования конфигурации по умолчанию"
-
-#: internal/config/config.go:121
-msgid "Unable to detect cache directory"
-msgstr "Не удалось обнаружить каталог кэша"
-
-#: internal/config/config.go:131
-msgid "Unable to create repo cache directory"
-msgstr "Не удалось создать каталог кэша репозитория"
-
-#: internal/config/config.go:137
-msgid "Unable to create package cache directory"
-msgstr "Не удалось создать каталог кэша пакетов"
-
-#: internal/config/lang.go:50
-msgid "Error parsing system language"
-msgstr "Ошибка при парсинге языка системы"
-
-#: internal/db/db.go:131
-msgid "Database version mismatch; resetting"
-msgstr "Несоответствие версий базы данных; сброс настроек"
-
-#: internal/db/db.go:135
-msgid ""
-"Database version does not exist. Run alr fix if something isn't working."
-msgstr ""
-"Версия базы данных не существует. Запустите alr fix, если что-то не работает."
-
-#: internal/db/db_legacy.go:101
-msgid "Error opening database"
-msgstr "Ошибка при открытии базы данных"
-
-#: internal/dl/dl.go:170
-msgid "Source can be updated, updating if required"
-msgstr "Исходный код можно обновлять, обновляя при необходимости"
-
-#: internal/dl/dl.go:201
-msgid "Source found in cache and linked to destination"
-msgstr "Источник найден в кэше и связан с пунктом назначения"
-
-#: internal/dl/dl.go:208
-msgid "Source updated and linked to destination"
-msgstr "Источник обновлён и связан с пунктом назначения"
-
-#: internal/dl/dl.go:222
-msgid "Downloading source"
-msgstr "Скачивание источника"
-
-#: internal/dl/progress_tui.go:100
-msgid "%s: done!\n"
-msgstr ""
-
-#: internal/dl/progress_tui.go:104
-msgid "%s %s downloading at %s/s\n"
-msgstr ""
-
-#: internal/logger/log.go:47
-msgid "ERROR"
-msgstr "ОШИБКА"
-
-#: list.go:40
-msgid "List ALR repo packages"
-msgstr "Список пакетов репозитория ALR"
-
-#: list.go:91
-msgid "Error listing installed packages"
-msgstr "Ошибка при составлении списка установленных пакетов"
-
-#: main.go:45
-msgid "Print the current ALR version and exit"
-msgstr "Показать текущую версию ALR и выйти"
-
-#: main.go:61
-msgid "Arguments to be passed on to the package manager"
-msgstr "Аргументы, которые будут переданы менеджеру пакетов"
-
-#: main.go:67
-msgid "Enable interactive questions and prompts"
-msgstr "Включение интерактивных вопросов и запросов"
-
-#: main.go:90
-msgid ""
-"Running ALR as root is forbidden as it may cause catastrophic damage to your "
-"system"
-msgstr ""
-"Запуск ALR от имени root запрещён, так как это может привести к "
-"катастрофическому повреждению вашей системы"
-
-#: main.go:124
-msgid "Error while running app"
-msgstr "Ошибка при запуске приложения"
-
-#: pkg/build/build.go:107
-msgid "Failed to prompt user to view build script"
-msgstr "Не удалось предложить пользователю просмотреть скрипт сборки"
-
-#: pkg/build/build.go:111
-msgid "Building package"
-msgstr "Сборка пакета"
-
-#: pkg/build/build.go:155
-msgid "Downloading sources"
-msgstr "Скачивание источников"
-
-#: pkg/build/build.go:167
-msgid "Building package metadata"
-msgstr "Сборка метаданных пакета"
-
-#: pkg/build/build.go:189
-msgid "Compressing package"
-msgstr "Сжатие пакета"
-
-#: pkg/build/build.go:315
-msgid ""
-"Your system's CPU architecture doesn't match this package. Do you want to "
-"build anyway?"
-msgstr ""
-"Архитектура процессора вашей системы не соответствует этому пакету. Вы все "
-"равно хотите выполнить сборку?"
-
-#: pkg/build/build.go:326
-msgid "This package is already installed"
-msgstr "Этот пакет уже установлен"
-
-#: pkg/build/build.go:354
-msgid "Installing build dependencies"
-msgstr "Установка зависимостей сборки"
-
-#: pkg/build/build.go:396
-msgid "Installing dependencies"
-msgstr "Установка зависимостей"
-
-#: pkg/build/build.go:442
-msgid "Executing version()"
-msgstr "Исполнение версия()"
-
-#: pkg/build/build.go:462
-msgid "Updating version"
-msgstr "Обновление версии"
-
-#: pkg/build/build.go:467
-msgid "Executing prepare()"
-msgstr "Исполнение prepare()"
-
-#: pkg/build/build.go:477
-msgid "Executing build()"
-msgstr "Исполнение build()"
-
-#: pkg/build/build.go:489
-msgid "Executing package()"
-msgstr "Исполнение package()"
-
-#: pkg/build/build.go:527
-msgid "Executing files()"
-msgstr "Исполнение files()"
-
-#: pkg/build/build.go:605
-msgid "AutoProv is not implemented for this package format, so it's skipped"
-msgstr ""
-"AutoProv не реализовано для этого формата пакета, поэтому будет пропущено"
-
-#: pkg/build/build.go:616
-msgid "AutoReq is not implemented for this package format, so it's skipped"
-msgstr ""
-"AutoReq не реализовано для этого формата пакета, поэтому будет пропущено"
-
-#: pkg/build/build.go:723
-msgid "Would you like to remove the build dependencies?"
-msgstr "Хотели бы вы удалить зависимости сборки?"
-
-#: pkg/build/build.go:829
-msgid "The checksums array must be the same length as sources"
-msgstr "Массив контрольных сумм должен быть той же длины, что и источники"
-
-#: pkg/build/findDeps.go:35
-msgid "Command not found on the system"
-msgstr "Команда не найдена в системе"
-
-#: pkg/build/findDeps.go:82
-msgid "Provided dependency found"
-msgstr "Найденная предоставленная зависимость"
-
-#: pkg/build/findDeps.go:89
-msgid "Required dependency found"
-msgstr "Найдена требуемая зависимость"
-
-#: pkg/build/install.go:42
-msgid "Error installing native packages"
-msgstr "Ошибка при установке нативных пакетов"
-
-#: pkg/build/install.go:79
-msgid "Error installing package"
-msgstr "Ошибка при установке пакета"
-
-#: pkg/repos/pull.go:75
-msgid "Pulling repository"
-msgstr "Скачивание репозитория"
-
-#: pkg/repos/pull.go:99
-msgid "Repository up to date"
-msgstr "Репозиторий уже обновлён"
-
-#: pkg/repos/pull.go:156
-msgid "Git repository does not appear to be a valid ALR repo"
-msgstr "Репозиторий Git не поддерживается репозиторием ALR"
-
-#: pkg/repos/pull.go:172
-msgid ""
-"ALR repo's minimum ALR version is greater than the current version. Try "
-"updating ALR if something doesn't work."
-msgstr ""
-"Минимальная версия ALR для ALR-репозитория выше текущей версии. Попробуйте "
-"обновить ALR, если что-то не работает."
-
-#: repo.go:41
-msgid "Add a new repository"
-msgstr "Добавить новый репозиторий"
-
-#: repo.go:48
-msgid "Name of the new repo"
-msgstr "Название нового репозитория"
-
-#: repo.go:54
-msgid "URL of the new repo"
-msgstr "URL-адрес нового репозитория"
-
-#: repo.go:79 repo.go:136
-msgid "Error opening config file"
-msgstr "Ошибка при открытии конфигурационного файла"
-
-#: repo.go:85 repo.go:142
-msgid "Error encoding config"
-msgstr "Ошибка при кодировании конфигурации"
-
-#: repo.go:103
-msgid "Remove an existing repository"
-msgstr "Удалить существующий репозиторий"
-
-#: repo.go:110
-msgid "Name of the repo to be deleted"
-msgstr "Название репозитория  удалён"
-
-#: repo.go:128
-msgid "Repo does not exist"
-msgstr "Репозитория не существует"
-
-#: repo.go:148
-msgid "Error removing repo directory"
-msgstr "Ошибка при удалении каталога репозитория"
-
-#: repo.go:154
-msgid "Error removing packages from database"
-msgstr "Ошибка при удалении пакетов из базы данных"
-
-#: repo.go:166
-msgid "Pull all repositories that have changed"
-msgstr "Скачать все изменённые репозитории"
-
-#: upgrade.go:47
-msgid "Upgrade all installed packages"
-msgstr "Обновить все установленные пакеты"
-
-#: upgrade.go:83
-msgid "Error checking for updates"
-msgstr "Ошибка при проверке обновлений"
-
-#: upgrade.go:94
-msgid "There is nothing to do."
-msgstr "Здесь нечего делать."

internal/translations/translations.go

@@ -1,52 +1,56 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 translations
 
 import (
+	"context"
 	"embed"
-	"io/fs"
+	"sync"
-	"os"
-	"path"
 
-	"github.com/jeandeaual/go-locale"
+	"go.elara.ws/logger"
-	"github.com/leonelquinteros/gotext"
+	"plemya-x.ru/alr/pkg/loggerctx"
+	"go.elara.ws/translate"
+	"golang.org/x/text/language"
 )
 
-//go:embed po
+//go:embed files
-var poFS embed.FS
+var translationFS embed.FS
 
-func Setup() {
+var (
-	userLanguage, err := locale.GetLanguage()
+	mu         sync.Mutex
+	translator *translate.Translator
+)
+
+func Translator(ctx context.Context) *translate.Translator {
+	mu.Lock()
+	defer mu.Unlock()
+	log := loggerctx.From(ctx)
+	if translator == nil {
+		t, err := translate.NewFromFS(translationFS)
 		if err != nil {
-		panic(err)
+			log.Fatal("Error creating new translator").Err(err).Send()
+		}
+		translator = &t
+	}
+	return translator
 }
 
-	_, err = fs.Stat(poFS, path.Join("po", userLanguage))
+func NewLogger(ctx context.Context, l logger.Logger, lang language.Tag) *translate.TranslatedLogger {
-	if err != nil {
+	return translate.NewLogger(l, *Translator(ctx), lang)
-		if os.IsNotExist(err) {
-			return
-		}
-		panic(err)
-	}
-
-	loc := gotext.NewLocaleFSWithPath(userLanguage, &poFS, "po")
-	loc.SetDomain("default")
-	gotext.SetLocales([]*gotext.Locale{loc})
 }

internal/types/build.go

@@ -1,25 +1,24 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 types
 
-import "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
+import "plemya-x.ru/alr/pkg/manager"
 
 type BuildOpts struct {
 	Script      string
@@ -50,8 +49,6 @@ type BuildVars struct {
 	Checksums     []string `sh:"checksums"`
 	Backup        []string `sh:"backup"`
 	Scripts       Scripts  `sh:"scripts"`
-	AutoReq       []string `sh:"auto_req"`
-	AutoProv      []string `sh:"auto_prov"`
 }
 
 type Scripts struct {

internal/types/config.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 types
 
@@ -26,7 +25,6 @@ type Config struct {
 	IgnorePkgUpdates []string `toml:"ignorePkgUpdates"`
 	Repos            []Repo   `toml:"repo"`
 	Unsafe           Unsafe   `toml:"unsafe"`
-	AutoPull         bool     `toml:"autoPull"`
 }
 
 // Repo represents a ALR repo within a configuration file

internal/types/repo.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 types
 

license-header-old-files.tmpl

@@ -1,18 +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) {{ .Year }} Евгений Храмов
-
-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/>.

license-header.tmpl

@@ -1,15 +0,0 @@
-ALR - Any Linux Repository
-Copyright (C) {{ .Year }} Евгений Храмов
-
-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/>.

list.go

@@ -1,43 +1,38 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// You should have received a copy of the GNU General Public License
+ */
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package main
 
 import (
 	"fmt"
-	"log/slog"
-	"os"
 
-	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
 	"golang.org/x/exp/slices"
-
+	"plemya-x.ru/alr/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	database "plemya-x.ru/alr/internal/db"
-	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"plemya-x.ru/alr/pkg/loggerctx"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
+	"plemya-x.ru/alr/pkg/manager"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
+	"plemya-x.ru/alr/pkg/repos"
 )
 
-func ListCmd() *cli.Command {
+var listCmd = &cli.Command{
-	return &cli.Command{
 	Name:    "list",
-		Usage:   gotext.Get("List ALR repo packages"),
+	Usage:   "List ALR repo packages",
 	Aliases: []string{"ls"},
 	Flags: []cli.Flag{
 		&cli.BoolFlag{
@@ -47,21 +42,17 @@ func ListCmd() *cli.Command {
 	},
 	Action: func(c *cli.Context) error {
 		ctx := c.Context
+		log := loggerctx.From(ctx)
 		cfg := config.New()
 		db := database.New(cfg)
 		err := db.Init(ctx)
 		if err != nil {
-				slog.Error(gotext.Get("Error initialization database"), "err", err)
+			log.Fatal("Error initialization database").Err(err).Send()
-				os.Exit(1)
 		}
 		rs := repos.New(cfg, db)
-
-			if cfg.AutoPull(ctx) {
 		err = rs.Pull(ctx, cfg.Repos(ctx))
 		if err != nil {
-					slog.Error(gotext.Get("Error pulling repositories"), "err", err)
+			log.Fatal("Error pulling repositories").Err(err).Send()
-					os.Exit(1)
-				}
 		}
 
 		where := "true"
@@ -73,8 +64,7 @@ func ListCmd() *cli.Command {
 
 		result, err := db.GetPkgs(ctx, where, args...)
 		if err != nil {
-				slog.Error(gotext.Get("Error getting packages"), "err", err)
+			log.Fatal("Error getting packages").Err(err).Send()
-				os.Exit(1)
 		}
 		defer result.Close()
 
@@ -82,14 +72,12 @@ func ListCmd() *cli.Command {
 		if c.Bool("installed") {
 			mgr := manager.Detect()
 			if mgr == nil {
-					slog.Error(gotext.Get("Unable to detect a supported package manager on the system"))
+				log.Fatal("Unable to detect a supported package manager on the system").Send()
-					os.Exit(1)
 			}
 
 			installed, err = mgr.ListInstalled(&manager.Opts{AsRoot: false})
 			if err != nil {
-					slog.Error(gotext.Get("Error listing installed packages"), "err", err)
+				log.Fatal("Error listing installed packages").Err(err).Send()
-					os.Exit(1)
 			}
 		}
 
@@ -118,11 +106,9 @@ func ListCmd() *cli.Command {
 		}
 
 		if err != nil {
-				slog.Error(gotext.Get("Error iterating over packages"), "err", err)
+			log.Fatal("Error iterating over packages").Err(err).Send()
-				os.Exit(1)
 		}
 
 		return nil
 	},
 }
-}

main.go

@@ -1,94 +1,78 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// You should have received a copy of the GNU General Public License
+ */
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package main
 
 import (
 	"context"
-	"log/slog"
 	"os"
 	"os/signal"
 	"strings"
 	"syscall"
 
-	"github.com/leonelquinteros/gotext"
 	"github.com/mattn/go-isatty"
 	"github.com/urfave/cli/v2"
-
+	"go.elara.ws/logger"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"plemya-x.ru/alr/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"plemya-x.ru/alr/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/translations"
+	"plemya-x.ru/alr/internal/translations"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
+	"plemya-x.ru/alr/pkg/loggerctx"
-
+	"plemya-x.ru/alr/pkg/manager"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/logger"
 )
 
-func VersionCmd() *cli.Command {
+var app = &cli.App{
-	return &cli.Command{
-		Name:  "version",
-		Usage: gotext.Get("Print the current ALR version and exit"),
-		Action: func(ctx *cli.Context) error {
-			println(config.Version)
-			return nil
-		},
-	}
-}
-
-func GetApp() *cli.App {
-	return &cli.App{
 	Name:  "alr",
 	Usage: "Any Linux Repository",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:    "pm-args",
 			Aliases: []string{"P"},
-				Usage:   gotext.Get("Arguments to be passed on to the package manager"),
+			Usage:   "Arguments to be passed on to the package manager",
 		},
 		&cli.BoolFlag{
 			Name:    "interactive",
 			Aliases: []string{"i"},
 			Value:   isatty.IsTerminal(os.Stdin.Fd()),
-				Usage:   gotext.Get("Enable interactive questions and prompts"),
+			Usage:   "Enable interactive questions and prompts",
 		},
 	},
 	Commands: []*cli.Command{
-			InstallCmd(),
+		installCmd,
-			RemoveCmd(),
+		removeCmd,
-			UpgradeCmd(),
+		upgradeCmd,
-			InfoCmd(),
+		infoCmd,
-			ListCmd(),
+		listCmd,
-			BuildCmd(),
+		buildCmd,
-			AddRepoCmd(),
+		addrepoCmd,
-			RemoveRepoCmd(),
+		removerepoCmd,
-			RefreshCmd(),
+		refreshCmd,
-			FixCmd(),
+		fixCmd,
-			GenCmd(),
+		genCmd,
-			HelperCmd(),
+		helperCmd,
-			VersionCmd(),
+		versionCmd,
 	},
 	Before: func(c *cli.Context) error {
 		ctx := c.Context
+		log := loggerctx.From(ctx)
 
 		cmd := c.Args().First()
 		if cmd != "helper" && !config.Config(ctx).Unsafe.AllowRunAsRoot && os.Geteuid() == 0 {
-				slog.Error(gotext.Get("Running ALR as root is forbidden as it may cause catastrophic damage to your system"))
+			log.Fatal("Running ALR as root is forbidden as it may cause catastrophic damage to your system").Send()
-				os.Exit(1)
 		}
 
 		if trimmed := strings.TrimSpace(c.String("pm-args")); trimmed != "" {
@@ -103,15 +87,20 @@ func GetApp() *cli.App {
 	},
 	EnableBashCompletion: true,
 }
+
+var versionCmd = &cli.Command{
+	Name:  "version",
+	Usage: "Print the current ALR version and exit",
+	Action: func(ctx *cli.Context) error {
+		println(config.Version)
+		return nil
+	},
 }
 
 func main() {
-	translations.Setup()
-	logger.SetupDefault()
-
-	app := GetApp()
-
 	ctx := context.Background()
+	log := translations.NewLogger(ctx, logger.NewCLI(os.Stderr), config.Language(ctx))
+	ctx = loggerctx.With(ctx, log)
 
 	// Set the root command to the one set in the ALR config
 	manager.DefaultRootCmd = config.Config(ctx).RootCmd
@@ -121,6 +110,6 @@ func main() {
 
 	err := app.RunContext(ctx, os.Args)
 	if err != nil {
-		slog.Error(gotext.Get("Error while running app"), "err", err)
+		log.Error("Error while running app").Err(err).Send()
 	}
 }

old-files

@@ -1,83 +0,0 @@
-./.github/FUNDING.yml
-./.gitignore
-./.goreleaser.yaml
-./.woodpecker.yml
-./LICENSE
-./Makefile
-./README.md
-./assets/logo.png
-./build.go
-./docs/README.md
-./docs/configuration.md
-./docs/packages/README.md
-./docs/packages/adding-packages.md
-./docs/packages/build-scripts.md
-./docs/packages/conventions.md
-./docs/usage.md
-./fix.go
-./gen.go
-./go.mod
-./go.sum
-./helper.go
-./info.go
-./install.go
-./internal/cliutils/prompt.go
-./internal/config/config.go
-./internal/config/lang.go
-./internal/config/paths.go
-./internal/config/version.go
-./internal/cpu/cpu.go
-./internal/db/db.go
-./internal/db/db_test.go
-./internal/dl/dl.go
-./internal/dl/file.go
-./internal/dl/git.go
-./internal/dl/torrent.go
-./internal/dlcache/dlcache.go
-./internal/dlcache/dlcache_test.go
-./internal/osutils/move.go
-./internal/overrides/overrides.go
-./internal/overrides/overrides_test.go
-./internal/pager/highlighting.go
-./internal/pager/pager.go
-./internal/shutils/decoder/decoder.go
-./internal/shutils/decoder/decoder_test.go
-./internal/shutils/handlers/exec.go
-./internal/shutils/handlers/exec_test.go
-./internal/shutils/handlers/fakeroot.go
-./internal/shutils/handlers/nop.go
-./internal/shutils/handlers/nop_test.go
-./internal/shutils/handlers/restricted.go
-./internal/shutils/helpers/helpers.go
-./internal/translations/files/lure.en.toml
-./internal/translations/files/lure.ru.toml
-./internal/translations/translations.go
-./internal/types/build.go
-./internal/types/config.go
-./internal/types/repo.go
-./list.go
-./main.go
-./pkg/build/build.go
-./pkg/build/install.go
-./pkg/distro/osrelease.go
-./pkg/gen/funcs.go
-./pkg/gen/pip.go
-./pkg/gen/tmpls/pip.tmpl.sh
-./pkg/loggerctx/log.go
-./pkg/manager/apk.go
-./pkg/manager/apt.go
-./pkg/manager/dnf.go
-./pkg/manager/managers.go
-./pkg/manager/pacman.go
-./pkg/manager/yum.go
-./pkg/manager/zypper.go
-./pkg/repos/find.go
-./pkg/repos/find_test.go
-./pkg/repos/pull.go
-./pkg/repos/pull_test.go
-./pkg/search/search.go
-./repo.go
-./scripts/completion/bash
-./scripts/completion/zsh
-./scripts/install.sh
-./upgrade.go

pkg/build/build.go

@@ -1,21 +1,29 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// the Free Software Foundation, either version 3 of the License, or
+ * Это программное обеспечение свободно: вы можете распространять его и/или изменять
-// (at your option) any later version.
+ * на условиях GNU General Public License, опубликованной Free Software Foundation,
-//
+ * либо версии 3 лицензии, либо (на ваш выбор) любой более поздней версии.
-// This program is distributed in the hope that it will be useful,
+ *
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is distributed in the hope that it will be useful,
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// GNU General Public License for more details.
+ * 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/>.
+ * но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ; даже без подразумеваемой гарантии
+ * КОММЕРЧЕСКОЙ ПРИГОДНОСТИ или ПРИГОДНОСТИ ДЛЯ ОПРЕДЕЛЕННОЙ ЦЕЛИ. См.
+ * GNU General Public License для более подробной информации.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * Вы должны были получить копию GNU General Public License
+ * вместе с этой программой. Если нет, см. <http://www.gnu.org/licenses/>.
+ */
 
 package build
 
@@ -25,7 +33,6 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
-	"log/slog"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -35,39 +42,35 @@ import (
 	"time"
 
 	// Импортируем пакеты для поддержки различных форматов пакетов (APK, DEB, RPM и ARCH).
-
-	"github.com/google/shlex"
 	_ "github.com/goreleaser/nfpm/v2/apk"
 	_ "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/expand"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
 
 	"github.com/goreleaser/nfpm/v2"
 	"github.com/goreleaser/nfpm/v2/files"
-
+	"plemya-x.ru/alr/internal/cliutils"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
+	"plemya-x.ru/alr/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"plemya-x.ru/alr/internal/cpu"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu"
+	"plemya-x.ru/alr/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"plemya-x.ru/alr/internal/dl"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/dl"
+	"plemya-x.ru/alr/internal/shutils/decoder"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
+	"plemya-x.ru/alr/internal/shutils/handlers"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder"
+	"plemya-x.ru/alr/internal/shutils/helpers"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
+	"plemya-x.ru/alr/internal/types"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/helpers"
+	"plemya-x.ru/alr/pkg/distro"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
+	"plemya-x.ru/alr/pkg/loggerctx"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
+	"plemya-x.ru/alr/pkg/manager"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
+	"plemya-x.ru/alr/pkg/repos"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
 )
 
 // Функция BuildPackage выполняет сборку скрипта по указанному пути. Возвращает два среза.
 // Один содержит пути к собранным пакетам, другой - имена собранных пакетов.
 func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string, error) {
-	reposInstance := repos.GetInstance(ctx)
+	log := loggerctx.From(ctx)
 
 	info, err := distro.ParseOSRelease(ctx)
 	if err != nil {
@@ -104,11 +107,10 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string
 	// Спрашиваем у пользователя, хочет ли он увидеть скрипт сборки.
 	err = cliutils.PromptViewScript(ctx, opts.Script, vars.Name, config.Config(ctx).PagerStyle, opts.Interactive)
 	if err != nil {
-		slog.Error(gotext.Get("Failed to prompt user to view build script"), "err", err)
+		log.Fatal("Failed to prompt user to view build script").Err(err).Send()
-		os.Exit(1)
 	}
 
-	slog.Info(gotext.Get("Building package"), "name", vars.Name, "version", vars.Version)
+	log.Info("Building package").Str("name", vars.Name).Str("version", vars.Version).Send()
 
 	// Второй проход будет использоваться для выполнения реального кода,
 	// поэтому он не ограничен. Скрипт уже был показан
@@ -137,12 +139,12 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string
 		return nil, nil, err
 	}
 
-	buildDeps, err := installBuildDeps(ctx, reposInstance, vars, opts) // Устанавливаем зависимости для сборки
+	buildDeps, err := installBuildDeps(ctx, vars, opts, installed) // Устанавливаем зависимости для сборки
 	if err != nil {
 		return nil, nil, err
 	}
 
-	err = installOptDeps(ctx, reposInstance, vars, opts) // Устанавливаем опциональные зависимости
+	err = installOptDeps(ctx, vars, opts, installed) // Устанавливаем опциональные зависимости
 	if err != nil {
 		return nil, nil, err
 	}
@@ -152,23 +154,23 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string
 		return nil, nil, err
 	}
 
-	slog.Info(gotext.Get("Downloading sources")) // Записываем в лог загрузку источников
+	log.Info("Downloading sources").Send() // Записываем в лог загрузку источников
 
 	err = getSources(ctx, dirs, vars) // Загружаем исходники
 	if err != nil {
 		return nil, nil, err
 	}
 
-	funcOut, err := executeFunctions(ctx, dec, dirs, vars) // Выполняем специальные функции
+	err = executeFunctions(ctx, dec, dirs, vars) // Выполняем специальные функции
 	if err != nil {
 		return nil, nil, err
 	}
 
-	slog.Info(gotext.Get("Building package metadata"), "name", vars.Name)
+	log.Info("Building package metadata").Str("name", vars.Name).Send() // Логгируем сборку метаданных пакета
 
 	pkgFormat := getPkgFormat(opts.Manager) // Получаем формат пакета
 
-	pkgInfo, err := buildPkgMetadata(ctx, vars, dirs, pkgFormat, info, append(repoDeps, builtNames...), funcOut.Contents) // Собираем метаданные пакета
+	pkgInfo, err := buildPkgMetadata(ctx, vars, dirs, pkgFormat, info, append(repoDeps, builtNames...)) // Собираем метаданные пакета
 	if err != nil {
 		return nil, nil, err
 	}
@@ -186,7 +188,7 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string
 		return nil, nil, err
 	}
 
-	slog.Info(gotext.Get("Compressing package"), "name", pkgName) // Логгируем сжатие пакета
+	log.Info("Compressing package").Str("name", pkgName).Send() // Логгируем сжатие пакета
 
 	err = packager.Package(pkgInfo, pkgFile) // Упаковываем пакет
 	if err != nil {
@@ -311,8 +313,9 @@ func prepareDirs(dirs types.Directories) error {
 
 // Функция performChecks проверяет различные аспекты в системе, чтобы убедиться, что пакет может быть установлен.
 func performChecks(ctx context.Context, vars *types.BuildVars, interactive bool, installed map[string]string) (bool, error) {
+	log := loggerctx.From(ctx)
 	if !cpu.IsCompatibleWith(cpu.Arch(), vars.Architectures) { // Проверяем совместимость архитектуры
-		cont, err := cliutils.YesNoPrompt(ctx, gotext.Get("Your system's CPU architecture doesn't match this package. Do you want to build anyway?"), interactive, true)
+		cont, err := cliutils.YesNoPrompt(ctx, "Your system's CPU architecture doesn't match this package. Do you want to build anyway?", interactive, true)
 		if err != nil {
 			return false, err
 		}
@@ -323,35 +326,29 @@ func performChecks(ctx context.Context, vars *types.BuildVars, interactive bool,
 	}
 
 	if instVer, ok := installed[vars.Name]; ok { // Если пакет уже установлен, выводим предупреждение
-		slog.Warn(gotext.Get("This package is already installed"),
+		log.Warn("This package is already installed").
-			"name", vars.Name,
+			Str("name", vars.Name).
-			"version", instVer,
+			Str("version", instVer).
-		)
+			Send()
 	}
 
 	return true, nil
 }
 
-type PackageFinder interface {
-	FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error)
-}
-
 // Функция installBuildDeps устанавливает все зависимости сборки, которые еще не установлены, и возвращает
 // срез, содержащий имена всех установленных пакетов.
-func installBuildDeps(ctx context.Context, repos PackageFinder, vars *types.BuildVars, opts types.BuildOpts) ([]string, error) {
+func installBuildDeps(ctx context.Context, vars *types.BuildVars, opts types.BuildOpts, installed map[string]string) ([]string, error) {
+	log := loggerctx.From(ctx)
 	var buildDeps []string
 	if len(vars.BuildDepends) > 0 {
-		deps, err := removeAlreadyInstalled(opts, vars.BuildDepends)
+		found, notFound, err := repos.FindPkgs(ctx, vars.BuildDepends) // Находим пакеты-зависимости
 		if err != nil {
 			return nil, err
 		}
 
-		found, notFound, err := repos.FindPkgs(ctx, deps) // Находим пакеты-зависимости
+		found = removeAlreadyInstalled(found, installed) // Убираем уже установленные зависимости
-		if err != nil {
-			return nil, err
-		}
 
-		slog.Info(gotext.Get("Installing build dependencies")) // Логгируем установку зависимостей
+		log.Info("Installing build dependencies").Send() // Логгируем установку зависимостей
 
 		flattened := cliutils.FlattenPkgs(ctx, found, "install", opts.Interactive) // Уплощаем список зависимостей
 		buildDeps = packageNames(flattened)
@@ -362,13 +359,9 @@ func installBuildDeps(ctx context.Context, repos PackageFinder, vars *types.Buil
 
 // Функция installOptDeps спрашивает у пользователя, какие, если таковые имеются, опциональные зависимости он хочет установить.
 // Если пользователь решает установить какие-либо опциональные зависимости, выполняется их установка.
-func installOptDeps(ctx context.Context, repos PackageFinder, vars *types.BuildVars, opts types.BuildOpts) error {
+func installOptDeps(ctx context.Context, vars *types.BuildVars, opts types.BuildOpts, installed map[string]string) error {
-	optDeps, err := removeAlreadyInstalled(opts, vars.OptDepends)
+	if len(vars.OptDepends) > 0 {
-	if err != nil {
+		optDeps, err := cliutils.ChooseOptDepends(ctx, vars.OptDepends, "install", opts.Interactive) // Пользователя просят выбрать опциональные зависимости
-		return err
-	}
-	if len(optDeps) > 0 {
-		optDeps, err := cliutils.ChooseOptDepends(ctx, optDeps, "install", opts.Interactive) // Пользователя просят выбрать опциональные зависимости
 		if err != nil {
 			return err
 		}
@@ -382,6 +375,7 @@ func installOptDeps(ctx context.Context, repos PackageFinder, vars *types.BuildV
 			return err
 		}
 
+		found = removeAlreadyInstalled(found, installed) // Убираем уже установленные зависимости
 		flattened := cliutils.FlattenPkgs(ctx, found, "install", opts.Interactive)
 		InstallPkgs(ctx, flattened, notFound, opts) // Устанавливаем выбранные пакеты
 	}
@@ -392,8 +386,9 @@ func installOptDeps(ctx context.Context, repos PackageFinder, vars *types.BuildV
 // пакетов, которые она собрала, а также все зависимости, которые не были найдены в ALR репозитории,
 // чтобы они могли быть установлены из системных репозиториев.
 func buildALRDeps(ctx context.Context, opts types.BuildOpts, vars *types.BuildVars) (builtPaths, builtNames, repoDeps []string, err error) {
+	log := loggerctx.From(ctx)
 	if len(vars.Depends) > 0 {
-		slog.Info(gotext.Get("Installing dependencies"))
+		log.Info("Installing dependencies").Send()
 
 		found, notFound, err := repos.FindPkgs(ctx, vars.Depends) // Поиск зависимостей
 		if err != nil {
@@ -431,54 +426,51 @@ func buildALRDeps(ctx context.Context, opts types.BuildOpts, vars *types.BuildVa
 	return builtPaths, builtNames, repoDeps, nil
 }
 
-type FunctionsOutput struct {
-	Contents *[]string
-}
-
 // Функция executeFunctions выполняет специальные функции ALR, такие как version(), prepare() и т.д.
-func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Directories, vars *types.BuildVars) (*FunctionsOutput, error) {
+func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Directories, vars *types.BuildVars) (err error) {
+	log := loggerctx.From(ctx)
 	version, ok := dec.GetFunc("version")
 	if ok {
-		slog.Info(gotext.Get("Executing version()"))
+		log.Info("Executing version()").Send()
 
 		buf := &bytes.Buffer{}
 
-		err := version(
+		err = version(
 			ctx,
 			interp.Dir(dirs.SrcDir),
 			interp.StdIO(os.Stdin, buf, os.Stderr),
 		)
 		if err != nil {
-			return nil, err
+			return err
 		}
 
 		newVer := strings.TrimSpace(buf.String())
 		err = setVersion(ctx, dec.Runner, newVer)
 		if err != nil {
-			return nil, err
+			return err
 		}
 		vars.Version = newVer
 
-		slog.Info(gotext.Get("Updating version"), "new", newVer)
+		log.Info("Updating version").Str("new", newVer).Send()
 	}
 
 	prepare, ok := dec.GetFunc("prepare")
 	if ok {
-		slog.Info(gotext.Get("Executing prepare()"))
+		log.Info("Executing prepare()").Send()
 
-		err := prepare(ctx, interp.Dir(dirs.SrcDir))
+		err = prepare(ctx, interp.Dir(dirs.SrcDir))
 		if err != nil {
-			return nil, err
+			return err
 		}
 	}
 
 	build, ok := dec.GetFunc("build")
 	if ok {
-		slog.Info(gotext.Get("Executing build()"))
+		log.Info("Executing build()").Send()
 
-		err := build(ctx, interp.Dir(dirs.SrcDir))
+		err = build(ctx, interp.Dir(dirs.SrcDir))
 		if err != nil {
-			return nil, err
+			return err
 		}
 	}
 
@@ -486,18 +478,17 @@ func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Dire
 	for {
 		packageFn, ok := dec.GetFunc("package")
 		if ok {
-			slog.Info(gotext.Get("Executing package()"))
+			log.Info("Executing package()").Send()
-			err := packageFn(ctx, interp.Dir(dirs.SrcDir))
+			err = packageFn(ctx, interp.Dir(dirs.SrcDir))
 			if err != nil {
-				return nil, err
+				return err
 			}
 		}
 
-		/*
 		// Проверка на наличие дополнительных функций package_*
 		packageFuncName := "package_"
 		if packageFunc, ok := dec.GetFunc(packageFuncName); ok {
-				slog.Info("Executing " + packageFuncName)
+			log.Info("Executing " + packageFuncName).Send()
 			err = packageFunc(ctx, interp.Dir(dirs.SrcDir))
 			if err != nil {
 				return err
@@ -505,58 +496,13 @@ func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Dire
 		} else {
 			break // Если больше нет функций package_*, выходим из цикла
 		}
-		*/
-		break
 	}
 
-	output := &FunctionsOutput{}
+	return nil
-
-	files, ok := dec.GetFuncP("files", func(ctx context.Context, s *interp.Runner) error {
-		// It should be done via interp.RunnerOption,
-		// but due to the issues below, it cannot be done.
-		// - https://github.com/mvdan/sh/issues/962
-		// - https://github.com/mvdan/sh/issues/1125
-		script, err := syntax.NewParser().Parse(strings.NewReader("cd $pkgdir && shopt -s globstar"), "")
-		if err != nil {
-			return err
-		}
-		return s.Run(ctx, script)
-	})
-
-	if ok {
-		slog.Info(gotext.Get("Executing files()"))
-
-		buf := &bytes.Buffer{}
-
-		err := files(
-			ctx,
-			interp.Dir(dirs.PkgDir),
-			interp.StdIO(os.Stdin, buf, os.Stderr),
-		)
-		if err != nil {
-			return nil, err
-		}
-
-		contents, err := shlex.Split(buf.String())
-		if err != nil {
-			return nil, err
-		}
-		output.Contents = &contents
-	}
-
-	return output, nil
 }
 
 // Функция buildPkgMetadata создает метаданные для пакета, который будет собран.
-func buildPkgMetadata(
+func buildPkgMetadata(ctx context.Context, vars *types.BuildVars, dirs types.Directories, pkgFormat string, info *distro.OSRelease, deps []string) (*nfpm.Info, error) {
-	ctx context.Context,
-	vars *types.BuildVars,
-	dirs types.Directories,
-	pkgFormat string,
-	info *distro.OSRelease,
-	deps []string,
-	preferedContents *[]string,
-) (*nfpm.Info, error) {
 	pkgInfo := getBasePkgInfo(vars)
 	pkgInfo.Description = vars.Description
 	pkgInfo.Platform = "linux"
@@ -577,7 +523,9 @@ func buildPkgMetadata(
 		})
 	}
 
-	pkgInfo.Release = overrides.ReleasePlatformSpecific(vars.Release, info)
+	if pkgFormat == "rpm" && info.ID == "altlinux" {
+		pkgInfo.Release = "alt" + pkgInfo.Release
+	}
 
 	if vars.Epoch != 0 {
 		pkgInfo.Epoch = strconv.FormatUint(uint64(vars.Epoch), 10)
@@ -589,32 +537,21 @@ func buildPkgMetadata(
 		pkgInfo.Arch = "all"
 	}
 
-	contents, err := buildContents(vars, dirs, preferedContents)
+	contents, err := buildContents(vars, dirs)
 	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
@@ -622,28 +559,22 @@ func buildPkgMetadata(
 
 // Функция buildContents создает секцию содержимого пакета, которая содержит файлы,
 // которые будут включены в конечный пакет.
-func buildContents(vars *types.BuildVars, dirs types.Directories, preferedContents *[]string) ([]*files.Content, error) {
+func buildContents(vars *types.BuildVars, dirs types.Directories) ([]*files.Content, error) {
 	contents := []*files.Content{}
-
+	err := filepath.Walk(dirs.PkgDir, func(path string, fi os.FileInfo, err error) error {
-	processPath := func(path, trimmed string, prefered bool) error {
+		trimmed := strings.TrimPrefix(path, dirs.PkgDir)
-		fi, err := os.Lstat(path)
-		if err != nil {
-			return err
-		}
 
 		if fi.IsDir() {
 			f, err := os.Open(path)
 			if err != nil {
 				return err
 			}
-			defer f.Close()
 
-			if !prefered {
+			// Если директория пустая, пропускаем её
 			_, err = f.Readdirnames(1)
 			if err != io.EOF {
 				return nil
 			}
-			}
 
 			contents = append(contents, &files.Content{
 				Source:      path,
@@ -653,14 +584,16 @@ func buildContents(vars *types.BuildVars, dirs types.Directories, preferedConten
 					MTime: fi.ModTime(),
 				},
 			})
-			return nil
-		}
 
+			return f.Close()
+		}
+		// Если файл является символической ссылкой, прорабатываем это
 		if fi.Mode()&os.ModeSymlink != 0 {
 			link, err := os.Readlink(path)
 			if err != nil {
 				return err
 			}
+			// Удаляем pkgdir из пути символической ссылки
 			link = strings.TrimPrefix(link, dirs.PkgDir)
 
 			contents = append(contents, &files.Content{
@@ -672,9 +605,10 @@ func buildContents(vars *types.BuildVars, dirs types.Directories, preferedConten
 					Mode:  fi.Mode(),
 				},
 			})
+
 			return nil
 		}
-
+		// Обрабатываем обычные файлы
 		fileContent := &files.Content{
 			Source:      path,
 			Destination: trimmed,
@@ -685,42 +619,23 @@ func buildContents(vars *types.BuildVars, dirs types.Directories, preferedConten
 			},
 		}
 
+		// Если файл должен быть сохранен, установите его тип как config|noreplace
 		if slices.Contains(vars.Backup, trimmed) {
 			fileContent.Type = "config|noreplace"
 		}
 
 		contents = append(contents, fileContent)
+
 		return nil
-	}
-
-	if preferedContents != nil {
-		for _, trimmed := range *preferedContents {
-			path := filepath.Join(dirs.PkgDir, trimmed)
-			if err := processPath(path, trimmed, true); err != nil {
-				return nil, err
-			}
-		}
-	} else {
-		err := filepath.Walk(dirs.PkgDir, func(path string, fi os.FileInfo, err error) error {
-			if err != nil {
-				return err
-			}
-			trimmed := strings.TrimPrefix(path, dirs.PkgDir)
-			return processPath(path, trimmed, false)
 	})
-		if err != nil {
+	return contents, err
-			return nil, err
-		}
-	}
-
-	return contents, nil
 }
 
 // Функция removeBuildDeps спрашивает у пользователя, хочет ли он удалить зависимости,
 // установленные для сборки. Если да, использует менеджер пакетов для их удаления.
 func removeBuildDeps(ctx context.Context, buildDeps []string, opts types.BuildOpts) error {
 	if len(buildDeps) > 0 {
-		remove, err := cliutils.YesNoPrompt(ctx, gotext.Get("Would you like to remove the build dependencies?"), opts.Interactive, false)
+		remove, err := cliutils.YesNoPrompt(ctx, "Would you like to remove the build dependencies?", opts.Interactive, false)
 		if err != nil {
 			return err
 		}
@@ -825,9 +740,9 @@ func createBuildEnvVars(info *distro.OSRelease, dirs types.Directories) []string
 
 // Функция getSources загружает исходники скрипта.
 func getSources(ctx context.Context, dirs types.Directories, bv *types.BuildVars) error {
+	log := loggerctx.From(ctx)
 	if len(bv.Sources) != len(bv.Checksums) {
-		slog.Error(gotext.Get("The checksums array must be the same length as sources"))
+		log.Fatal("The checksums array must be the same length as sources").Send()
-		os.Exit(1)
 	}
 
 	for i, src := range bv.Sources {
@@ -916,22 +831,21 @@ func setVersion(ctx context.Context, r *interp.Runner, to string) error {
 	return r.Run(ctx, fl)
 }
 
-// Returns not installed dependencies
+// Функция removeAlreadyInstalled возвращает карту без каких-либо зависимостей, которые уже установлены.
-func removeAlreadyInstalled(opts types.BuildOpts, dependencies []string) ([]string, error) {
+func removeAlreadyInstalled(found map[string][]db.Package, installed map[string]string) map[string][]db.Package {
-	filteredPackages := []string{}
+	filteredPackages := make(map[string][]db.Package)
 
-	for _, dep := range dependencies {
+	for name, pkgList := range found {
-		installed, err := opts.Manager.IsInstalled(dep)
+		filteredPkgList := []db.Package{}
-		if err != nil {
+		for _, pkg := range pkgList {
-			return nil, err
+			if _, isInstalled := installed[pkg.Name]; !isInstalled {
+				filteredPkgList = append(filteredPkgList, pkg)
 			}
-		if installed {
-			continue
 		}
-		filteredPackages = append(filteredPackages, dep)
+		filteredPackages[name] = filteredPkgList
 	}
 
-	return filteredPackages, nil
+	return filteredPackages
 }
 
 // Функция packageNames возвращает имена всех предоставленных пакетов.

pkg/build/build_internal_test.go

@@ -1,225 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 Евгений Храмов
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package build
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"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/manager"
-)
-
-type TestPackageFinder struct {
-	FindPkgsFunc func(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error)
-}
-
-func (pf *TestPackageFinder) FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error) {
-	if pf.FindPkgsFunc != nil {
-		return pf.FindPkgsFunc(ctx, pkgs)
-	}
-	return map[string][]db.Package{}, []string{}, nil
-}
-
-type TestManager struct {
-	NameFunc          func() string
-	FormatFunc        func() string
-	ExistsFunc        func() bool
-	SetRootCmdFunc    func(cmd string)
-	SyncFunc          func(opts *manager.Opts) error
-	InstallFunc       func(opts *manager.Opts, pkgs ...string) error
-	RemoveFunc        func(opts *manager.Opts, pkgs ...string) error
-	UpgradeFunc       func(opts *manager.Opts, pkgs ...string) error
-	InstallLocalFunc  func(opts *manager.Opts, files ...string) error
-	UpgradeAllFunc    func(opts *manager.Opts) error
-	ListInstalledFunc func(opts *manager.Opts) (map[string]string, error)
-	IsInstalledFunc   func(pkg string) (bool, error)
-}
-
-func (m *TestManager) Name() string {
-	if m.NameFunc != nil {
-		return m.NameFunc()
-	}
-	return "TestManager"
-}
-
-func (m *TestManager) Format() string {
-	if m.FormatFunc != nil {
-		return m.FormatFunc()
-	}
-	return "testpkg"
-}
-
-func (m *TestManager) Exists() bool {
-	if m.ExistsFunc != nil {
-		return m.ExistsFunc()
-	}
-	return true
-}
-
-func (m *TestManager) SetRootCmd(cmd string) {
-	if m.SetRootCmdFunc != nil {
-		m.SetRootCmdFunc(cmd)
-	}
-}
-
-func (m *TestManager) Sync(opts *manager.Opts) error {
-	if m.SyncFunc != nil {
-		return m.SyncFunc(opts)
-	}
-	return nil
-}
-
-func (m *TestManager) Install(opts *manager.Opts, pkgs ...string) error {
-	if m.InstallFunc != nil {
-		return m.InstallFunc(opts, pkgs...)
-	}
-	return nil
-}
-
-func (m *TestManager) Remove(opts *manager.Opts, pkgs ...string) error {
-	if m.RemoveFunc != nil {
-		return m.RemoveFunc(opts, pkgs...)
-	}
-	return nil
-}
-
-func (m *TestManager) Upgrade(opts *manager.Opts, pkgs ...string) error {
-	if m.UpgradeFunc != nil {
-		return m.UpgradeFunc(opts, pkgs...)
-	}
-	return nil
-}
-
-func (m *TestManager) InstallLocal(opts *manager.Opts, files ...string) error {
-	if m.InstallLocalFunc != nil {
-		return m.InstallLocalFunc(opts, files...)
-	}
-	return nil
-}
-
-func (m *TestManager) UpgradeAll(opts *manager.Opts) error {
-	if m.UpgradeAllFunc != nil {
-		return m.UpgradeAllFunc(opts)
-	}
-	return nil
-}
-
-func (m *TestManager) ListInstalled(opts *manager.Opts) (map[string]string, error) {
-	if m.ListInstalledFunc != nil {
-		return m.ListInstalledFunc(opts)
-	}
-	return map[string]string{}, nil
-}
-
-func (m *TestManager) IsInstalled(pkg string) (bool, error) {
-	if m.IsInstalledFunc != nil {
-		return m.IsInstalledFunc(pkg)
-	}
-	return true, nil
-}
-
-func TestInstallBuildDeps(t *testing.T) {
-	type testEnv struct {
-		pf   PackageFinder
-		vars *types.BuildVars
-		opts types.BuildOpts
-
-		// Contains pkgs captured by FindPkgsFunc
-		capturedPkgs []string
-	}
-
-	type testCase struct {
-		Name     string
-		Prepare  func() *testEnv
-		Expected func(t *testing.T, e *testEnv, res []string, err error)
-	}
-
-	for _, tc := range []testCase{
-		{
-			Name: "install only needed deps",
-			Prepare: func() *testEnv {
-				pf := TestPackageFinder{}
-				vars := types.BuildVars{}
-				m := TestManager{}
-				opts := types.BuildOpts{
-					Manager:     &m,
-					Interactive: false,
-				}
-
-				env := &testEnv{
-					pf:           &pf,
-					vars:         &vars,
-					opts:         opts,
-					capturedPkgs: []string{},
-				}
-
-				pf.FindPkgsFunc = func(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error) {
-					env.capturedPkgs = append(env.capturedPkgs, pkgs...)
-					result := make(map[string][]db.Package)
-					result["bar"] = []db.Package{{
-						Name: "bar-pkg",
-					}}
-					result["buz"] = []db.Package{{
-						Name: "buz-pkg",
-					}}
-
-					return result, []string{}, nil
-				}
-
-				vars.BuildDepends = []string{
-					"foo",
-					"bar",
-					"buz",
-				}
-				m.IsInstalledFunc = func(pkg string) (bool, error) {
-					if pkg == "foo" {
-						return true, nil
-					} else {
-						return false, nil
-					}
-				}
-
-				return env
-			},
-			Expected: func(t *testing.T, e *testEnv, res []string, err error) {
-				assert.NoError(t, err)
-				assert.Len(t, res, 2)
-				assert.ElementsMatch(t, res, []string{"bar-pkg", "buz-pkg"})
-
-				assert.ElementsMatch(t, e.capturedPkgs, []string{"bar", "buz"})
-			},
-		},
-	} {
-		t.Run(tc.Name, func(tt *testing.T) {
-			ctx := context.Background()
-			env := tc.Prepare()
-
-			result, err := installBuildDeps(
-				ctx,
-				env.pf,
-				env.vars,
-				env.opts,
-			)
-
-			tc.Expected(tt, env, result, err)
-		})
-	}
-}

pkg/build/findDeps.go

@@ -1,38 +1,22 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 Евгений Храмов
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 package build
 
 import (
 	"bytes"
 	"context"
-	"log/slog"
 	"os/exec"
 	"path"
 	"strings"
 
 	"github.com/goreleaser/nfpm/v2"
-	"github.com/leonelquinteros/gotext"
+	"plemya-x.ru/alr/internal/types"
-
+	"plemya-x.ru/alr/pkg/loggerctx"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 )
 
 func rpmFindDependencies(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Directories, command string, updateFunc func(string)) error {
+	log := loggerctx.From(ctx)
+
 	if _, err := exec.LookPath(command); err != nil {
-		slog.Info(gotext.Get("Command not found on the system"), "command", command)
+		log.Info("Command not found on the system").Str("command", command).Send()
 		return nil
 	}
 
@@ -63,7 +47,7 @@ func rpmFindDependencies(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Dir
 	cmd.Stdout = &out
 	cmd.Stderr = &stderr
 	if err := cmd.Run(); err != nil {
-		slog.Error(stderr.String())
+		log.Error(stderr.String())
 		return err
 	}
 
@@ -78,15 +62,19 @@ func rpmFindDependencies(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Dir
 }
 
 func rpmFindProvides(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Directories) error {
+	log := loggerctx.From(ctx)
+
 	return rpmFindDependencies(ctx, pkgInfo, dirs, "/usr/lib/rpm/find-provides", func(dep string) {
-		slog.Info(gotext.Get("Provided dependency found"), "dep", dep)
+		log.Info("Provided dependency found").Str("dep", dep).Send()
 		pkgInfo.Overridables.Provides = append(pkgInfo.Overridables.Provides, dep)
 	})
 }
 
 func rpmFindRequires(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Directories) error {
+	log := loggerctx.From(ctx)
+
 	return rpmFindDependencies(ctx, pkgInfo, dirs, "/usr/lib/rpm/find-requires", func(dep string) {
-		slog.Info(gotext.Get("Required dependency found"), "dep", dep)
+		log.Info("Required dependency found").Str("dep", dep).Send()
 		pkgInfo.Overridables.Depends = append(pkgInfo.Overridables.Depends, dep)
 	})
 }

pkg/build/install.go

@@ -1,46 +1,54 @@
-// 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
-//
+ * ALR - Любой Linux Репозиторий
-// ALR - Any Linux Repository
+ * Copyright (C) 2024 Евгений Храмов
-// Copyright (C) 2025 Евгений Храмов
+ *
-//
+ * This program is free software: you can redistribute it and/or modify
-// 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
+ * it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+ * на условиях GNU General Public License, опубликованной
-// (at your option) any later version.
+ * the Free Software Foundation, either version 3 of the License, or
-//
+ * Free Software Foundation, либо версии 3 лицензии, либо
-// This program is distributed in the hope that it will be useful,
+ * (at your option) any later version.
-// 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.
+ * This program is distributed in the hope that it will be useful,
-//
+ * Это программное обеспечение распространяется в надежде, что оно будет полезным,
-// You should have received a copy of the GNU General Public License
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * но БЕЗ КАКОЙ-ЛИБО ГАРАНТИИ; даже без подразумеваемой гарантии
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * КОММЕРЧЕСКОЙ ПРИГОДНОСТИ или ПРИГОДНОСТИ ДЛЯ ОПРЕДЕЛЕННОЙ ЦЕЛИ.
+ * GNU General Public License for more details.
+ * Подробности смотрите в GNU General Public License.
+ *
+ * You should have received a copy of the GNU General Public License
+ * Вы должны были получить копию GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * вместе с этой программой. Если нет, посмотрите <http://www.gnu.org/licenses/>.
+ */
 
 package build
 
 import (
 	"context"
-	"log/slog"
-	"os"
 	"path/filepath"
 
-	"github.com/leonelquinteros/gotext"
+	"plemya-x.ru/alr/internal/config"
-
+	"plemya-x.ru/alr/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"plemya-x.ru/alr/internal/types"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"plemya-x.ru/alr/pkg/loggerctx"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 )
 
 // InstallPkgs устанавливает нативные пакеты с использованием менеджера пакетов,
 // затем строит и устанавливает пакеты ALR
 func InstallPkgs(ctx context.Context, alrPkgs []db.Package, nativePkgs []string, opts types.BuildOpts) {
+	log := loggerctx.From(ctx) // Инициализируем логгер из контекста
+
 	if len(nativePkgs) > 0 {
 		err := opts.Manager.Install(nil, nativePkgs...)
         // Если есть нативные пакеты, выполняем их установку
 		if err != nil {
-			slog.Error(gotext.Get("Error installing native packages"), "err", err)
+			log.Fatal("Error installing native packages").Err(err).Send()
-			os.Exit(1)
             // Логируем и завершаем выполнение при ошибке
 		}
 	}
@@ -63,21 +71,20 @@ func GetScriptPaths(ctx context.Context, pkgs []db.Package) []string {
 
 // InstallScripts строит и устанавливает переданные alr скрипты сборки
 func InstallScripts(ctx context.Context, scripts []string, opts types.BuildOpts) {
+	log := loggerctx.From(ctx) // Получаем логгер из контекста
 	for _, script := range scripts {
 		opts.Script = script // Устанавливаем текущий скрипт в опции
 		builtPkgs, _, err := BuildPackage(ctx, opts)
         // Выполняем сборку пакета
 		if err != nil {
-			slog.Error(gotext.Get("Error building package"), "err", err)
+			log.Fatal("Error building package").Err(err).Send()
-			os.Exit(1)
             // Логируем и завершаем выполнение при ошибке сборки
 		}
 
 		err = opts.Manager.InstallLocal(nil, builtPkgs...)
         // Устанавливаем локально собранные пакеты
 		if err != nil {
-			slog.Error(gotext.Get("Error installing package"), "err", err)
+			log.Fatal("Error installing package").Err(err).Send()
-			os.Exit(1)
             // Логируем и завершаем выполнение при ошибке установки
 		}
 	}

pkg/distro/osrelease.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 distro
 
@@ -24,11 +23,10 @@ import (
 	"os"
 	"strings"
 
+	"plemya-x.ru/alr/internal/shutils/handlers"
 	"mvdan.cc/sh/v3/expand"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
 )
 
 // OSRelease contains information from an os-release file
@@ -44,7 +42,6 @@ type OSRelease struct {
 	SupportURL       string
 	BugReportURL     string
 	Logo             string
-	PlatformID       string
 }
 
 var parsed *OSRelease
@@ -103,7 +100,6 @@ func ParseOSRelease(ctx context.Context) (*OSRelease, error) {
 		SupportURL:       runner.Vars["SUPPORT_URL"].Str,
 		BugReportURL:     runner.Vars["BUG_REPORT_URL"].Str,
 		Logo:             runner.Vars["LOGO"].Str,
-		PlatformID:       runner.Vars["PLATFORM_ID"].Str,
 	}
 
 	distroUpdated := false

pkg/gen/funcs.go

@@ -1,22 +1,3 @@
-// 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 gen
 
 import (

pkg/gen/pip.go

@@ -1,22 +1,3 @@
-// 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 gen
 
 import (
@@ -31,7 +12,6 @@ import (
 
 // Используем директиву //go:embed для встраивания содержимого файла шаблона в строку pipTmpl
 // Встраивание файла tmpls/pip.tmpl.sh
-//
 //go:embed tmpls/pip.tmpl.sh
 var pipTmpl string
 

pkg/gen/tmpls/pip.tmpl.sh

@@ -1,22 +1,3 @@
-# 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/>.
-
 name='{{.Info.Name | tolower}}'
 version='{{.Info.Version}}'
 release='1'

pkg/loggerctx/log.go

@@ -0,0 +1,29 @@
+package loggerctx
+
+import (
+	"context"
+
+	"go.elara.ws/logger"
+)
+
+// loggerCtxKey is used as the context key for loggers
+type loggerCtxKey struct{}
+
+// With returns a copy of ctx containing log
+func With(ctx context.Context, log logger.Logger) context.Context {
+	return context.WithValue(ctx, loggerCtxKey{}, log)
+}
+
+// From attempts to get a logger from ctx. If ctx doesn't
+// contain a logger, it returns a nop logger.
+func From(ctx context.Context) logger.Logger {
+	if val := ctx.Value(loggerCtxKey{}); val != nil {
+		if log, ok := val.(logger.Logger); ok && log != nil {
+			return log
+		} else {
+			return logger.NewNop()
+		}
+	} else {
+		return logger.NewNop()
+	}
+}

pkg/manager/apk.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 manager
 
@@ -149,21 +148,6 @@ func (a *APK) ListInstalled(opts *Opts) (map[string]string, error) {
 	return out, nil
 }
 
-func (a *APK) IsInstalled(pkg string) (bool, error) {
-	cmd := exec.Command("apk", "info", "--installed", pkg)
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		if exitErr, ok := err.(*exec.ExitError); ok {
-			// Exit code 1 means the package is not installed
-			if exitErr.ExitCode() == 1 {
-				return false, nil
-			}
-		}
-		return false, fmt.Errorf("apk: isinstalled: %w, output: %s", err, output)
-	}
-	return true, nil
-}
-
 func (a *APK) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
 	var cmd *exec.Cmd
 	if opts.AsRoot {

pkg/manager/apt.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 manager
 
@@ -135,21 +134,6 @@ func (a *APT) ListInstalled(opts *Opts) (map[string]string, error) {
 	return out, nil
 }
 
-func (a *APT) IsInstalled(pkg string) (bool, error) {
-	cmd := exec.Command("dpkg-query", "-l", pkg)
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		if exitErr, ok := err.(*exec.ExitError); ok {
-			// Exit code 1 means the package is not installed
-			if exitErr.ExitCode() == 1 {
-				return false, nil
-			}
-		}
-		return false, fmt.Errorf("apt: isinstalled: %w, output: %s", err, output)
-	}
-	return true, nil
-}
-
 func (a *APT) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
 	var cmd *exec.Cmd
 	if opts.AsRoot {

pkg/manager/apt_rpm.go

@@ -1,22 +1,25 @@
-// ALR - Any Linux Repository
+/*
-// Copyright (C) 2025 Евгений Храмов
+ * ALR - Any Linux Repository
-//
+ * Copyright (C) 2024 Евгений Храмов
-// 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
+ * This program is free software: you can redistribute it and/or modify
-// the Free Software Foundation, either version 3 of the License, or
+ * it under the terms of the GNU General Public License as published by
-// (at your option) any later version.
+ * 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
+ * This program is distributed in the hope that it will be useful,
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// GNU General Public License for more details.
+ * 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/>.
+ * 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 manager
 
 import (
+	"bufio"
 	"fmt"
 	"os/exec"
 	"strings"
@@ -24,7 +27,6 @@ import (
 
 // APTRpm represents the APT-RPM package manager
 type APTRpm struct {
-	CommonRPM
 	rootCmd string
 }
 
@@ -105,6 +107,37 @@ func (a *APTRpm) UpgradeAll(opts *Opts) error {
 	}
 	return nil
 }
+func (y *APTRpm) ListInstalled(opts *Opts) (map[string]string, error) {
+	out := map[string]string{}
+	cmd := exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
+
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, err
+	}
+
+	err = cmd.Start()
+	if err != nil {
+		return nil, err
+	}
+
+	scanner := bufio.NewScanner(stdout)
+	for scanner.Scan() {
+		name, version, ok := strings.Cut(scanner.Text(), "\u200b")
+		if !ok {
+			continue
+		}
+		version = strings.TrimPrefix(version, "0:")
+		out[name] = version
+	}
+
+	err = scanner.Err()
+	if err != nil {
+		return nil, err
+	}
+
+	return out, nil
+}
 
 func (a *APTRpm) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
 	var cmd *exec.Cmd

pkg/manager/common_rpm.go

@@ -1,72 +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 manager
-
-import (
-	"bufio"
-	"fmt"
-	"os/exec"
-	"strings"
-)
-
-type CommonRPM struct{}
-
-func (c *CommonRPM) ListInstalled(opts *Opts) (map[string]string, error) {
-	out := map[string]string{}
-	cmd := exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
-
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		return nil, err
-	}
-
-	err = cmd.Start()
-	if err != nil {
-		return nil, err
-	}
-
-	scanner := bufio.NewScanner(stdout)
-	for scanner.Scan() {
-		name, version, ok := strings.Cut(scanner.Text(), "\u200b")
-		if !ok {
-			continue
-		}
-		version = strings.TrimPrefix(version, "0:")
-		out[name] = version
-	}
-
-	err = scanner.Err()
-	if err != nil {
-		return nil, err
-	}
-
-	return out, nil
-}
-
-func (a *CommonRPM) IsInstalled(pkg string) (bool, error) {
-	cmd := exec.Command("rpm", "-q", "--whatprovides", pkg)
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		if exitErr, ok := err.(*exec.ExitError); ok {
-			if exitErr.ExitCode() == 1 {
-				return false, nil
-			}
-		}
-		return false, fmt.Errorf("rpm: isinstalled: %w, output: %s", err, output)
-	}
-	return true, nil
-}

pkg/manager/dnf.go

@@ -19,13 +19,14 @@
 package manager
 
 import (
+    "bufio"
     "fmt"
     "os/exec"
+    "strings"
 )
 
 // DNF представляет менеджер пакетов DNF
 type DNF struct {
-	CommonRPM
     rootCmd string  // rootCmd хранит команду, используемую для выполнения команд с правами root
 }
 
@@ -119,6 +120,39 @@ func (d *DNF) UpgradeAll(opts *Opts) error {
     return nil
 }
 
+// ListInstalled возвращает список установленных пакетов и их версий
+func (d *DNF) ListInstalled(opts *Opts) (map[string]string, error) {
+    out := map[string]string{}
+    cmd := exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
+
+    stdout, err := cmd.StdoutPipe()
+    if err != nil {
+        return nil, err
+    }
+
+    err = cmd.Start()
+    if err != nil {
+        return nil, err
+    }
+
+    scanner := bufio.NewScanner(stdout)
+    for scanner.Scan() {
+        name, version, ok := strings.Cut(scanner.Text(), "\u200b")
+        if !ok {
+            continue
+        }
+        version = strings.TrimPrefix(version, "0:")
+        out[name] = version
+    }
+
+    err = scanner.Err()
+    if err != nil {
+        return nil, err
+    }
+
+    return out, nil
+}
+
 // getCmd создает и возвращает команду exec.Cmd для менеджера пакетов DNF
 func (d *DNF) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
     var cmd *exec.Cmd

pkg/manager/managers.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 manager
 
@@ -80,8 +79,6 @@ type Manager interface {
 	UpgradeAll(*Opts) error
 	// ListInstalled returns all installed packages mapped to their versions
 	ListInstalled(*Opts) (map[string]string, error)
-	//
-	IsInstalled(string) (bool, error)
 }
 
 // Detect returns the package manager detected on the system

pkg/manager/pacman.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 manager
 
@@ -142,21 +141,6 @@ func (p *Pacman) ListInstalled(opts *Opts) (map[string]string, error) {
 	return out, nil
 }
 
-func (p *Pacman) IsInstalled(pkg string) (bool, error) {
-	cmd := exec.Command("pacman", "-Q", pkg)
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		// Pacman returns exit code 1 if the package is not found
-		if exitErr, ok := err.(*exec.ExitError); ok {
-			if exitErr.ExitCode() == 1 {
-				return false, nil
-			}
-		}
-		return false, fmt.Errorf("pacman: isinstalled: %w, output: %s", err, output)
-	}
-	return true, nil
-}
-
 func (p *Pacman) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
 	var cmd *exec.Cmd
 	if opts.AsRoot {

pkg/manager/yum.go

@@ -1,33 +1,32 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 manager
 
 import (
+	"bufio"
 	"fmt"
 	"os/exec"
+	"strings"
 )
 
 // YUM represents the YUM package manager
 type YUM struct {
-	CommonRPM
-
 	rootCmd string
 }
 
@@ -111,6 +110,38 @@ func (y *YUM) UpgradeAll(opts *Opts) error {
 	return nil
 }
 
+func (y *YUM) ListInstalled(opts *Opts) (map[string]string, error) {
+	out := map[string]string{}
+	cmd := exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
+
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, err
+	}
+
+	err = cmd.Start()
+	if err != nil {
+		return nil, err
+	}
+
+	scanner := bufio.NewScanner(stdout)
+	for scanner.Scan() {
+		name, version, ok := strings.Cut(scanner.Text(), "\u200b")
+		if !ok {
+			continue
+		}
+		version = strings.TrimPrefix(version, "0:")
+		out[name] = version
+	}
+
+	err = scanner.Err()
+	if err != nil {
+		return nil, err
+	}
+
+	return out, nil
+}
+
 func (y *YUM) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
 	var cmd *exec.Cmd
 	if opts.AsRoot {

pkg/manager/zypper.go

@@ -1,32 +1,32 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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 manager
 
 import (
+	"bufio"
 	"fmt"
 	"os/exec"
+	"strings"
 )
 
 // Zypper represents the Zypper package manager
 type Zypper struct {
-	CommonRPM
 	rootCmd string
 }
 
@@ -110,6 +110,38 @@ func (z *Zypper) UpgradeAll(opts *Opts) error {
 	return nil
 }
 
+func (z *Zypper) ListInstalled(opts *Opts) (map[string]string, error) {
+	out := map[string]string{}
+	cmd := exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
+
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, err
+	}
+
+	err = cmd.Start()
+	if err != nil {
+		return nil, err
+	}
+
+	scanner := bufio.NewScanner(stdout)
+	for scanner.Scan() {
+		name, version, ok := strings.Cut(scanner.Text(), "\u200b")
+		if !ok {
+			continue
+		}
+		version = strings.TrimPrefix(version, "0:")
+		out[name] = version
+	}
+
+	err = scanner.Err()
+	if err != nil {
+		return nil, err
+	}
+
+	return out, nil
+}
+
 func (z *Zypper) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
 	var cmd *exec.Cmd
 	if opts.AsRoot {

pkg/repos/find.go

@@ -1,28 +1,26 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"plemya-x.ru/alr/internal/db"
 )
 
 func (rs *Repos) FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error) {

pkg/repos/find_test.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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_test
 
@@ -24,9 +23,9 @@ import (
 	"strings"
 	"testing"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"plemya-x.ru/alr/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
+	"plemya-x.ru/alr/internal/types"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
+	"plemya-x.ru/alr/pkg/repos"
 )
 
 func TestFindPkgs(t *testing.T) {

pkg/repos/pull.go

@@ -1,28 +1,26 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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"
 	"errors"
-	"log/slog"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -32,17 +30,16 @@ import (
 	"github.com/go-git/go-billy/v5/osfs"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
-	"github.com/leonelquinteros/gotext"
 	"github.com/pelletier/go-toml/v2"
 	"go.elara.ws/vercmp"
 	"mvdan.cc/sh/v3/expand"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
-
+	"plemya-x.ru/alr/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"plemya-x.ru/alr/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"plemya-x.ru/alr/internal/shutils/handlers"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
+	"plemya-x.ru/alr/internal/types"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
+	"plemya-x.ru/alr/pkg/loggerctx"
 )
 
 type actionType uint8
@@ -62,6 +59,8 @@ type action struct {
 // 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.
 func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error {
+	log := loggerctx.From(ctx)
+
 	if repos == nil {
 		repos = rs.cfg.Repos(ctx)
 	}
@@ -72,7 +71,7 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error {
 			return err
 		}
 
-		slog.Info(gotext.Get("Pulling repository"), "name", repo.Name)
+		log.Info("Pulling repository").Str("name", repo.Name).Send()
 		repoDir := filepath.Join(config.GetPaths(ctx).RepoDir, repo.Name)
 
 		var repoFS billy.Filesystem
@@ -96,7 +95,7 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error {
 
 			err = w.PullContext(ctx, &git.PullOptions{Progress: os.Stderr})
 			if errors.Is(err, git.NoErrAlreadyUpToDate) {
-				slog.Info(gotext.Get("Repository up to date"), "name", repo.Name)
+				log.Info("Repository up to date").Str("name", repo.Name).Send()
 			} else if err != nil {
 				return err
 			}
@@ -153,7 +152,7 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error {
 
 		fl, err := repoFS.Open("alr-repo.toml")
 		if err != nil {
-			slog.Warn(gotext.Get("Git repository does not appear to be a valid ALR repo"), "repo", repo.Name)
+			log.Warn("Git repository does not appear to be a valid ALR repo").Str("repo", repo.Name).Send()
 			continue
 		}
 
@@ -169,7 +168,7 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error {
 		// to compare it to the repo version, so only compare versions with the "v".
 		if strings.HasPrefix(config.Version, "v") {
 			if vercmp.Compare(config.Version, repoCfg.Repo.MinVersion) == -1 {
-				slog.Warn(gotext.Get("ALR repo's minimum ALR version is greater than the current version. Try updating ALR if something doesn't work."), "repo", repo.Name)
+				log.Warn("ALR repo's minumum ALR version is greater than the current version. Try updating ALR if something doesn't work.").Str("repo", repo.Name).Send()
 			}
 		}
 	}

pkg/repos/pull_test.go

@@ -1,21 +1,20 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// 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_test
 
@@ -25,11 +24,11 @@ import (
 	"path/filepath"
 	"testing"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"plemya-x.ru/alr/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"plemya-x.ru/alr/internal/db"
-	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	database "plemya-x.ru/alr/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
+	"plemya-x.ru/alr/internal/types"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
+	"plemya-x.ru/alr/pkg/repos"
 )
 
 type TestEnv struct {

pkg/repos/repos.go

@@ -1,27 +1,11 @@
-// 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"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"plemya-x.ru/alr/internal/config"
-	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	database "plemya-x.ru/alr/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
+	"plemya-x.ru/alr/internal/types"
 )
 
 type Config interface {

pkg/repos/repos_legacy.go

@@ -1,29 +1,13 @@
-// 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"
+	"plemya-x.ru/alr/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"plemya-x.ru/alr/internal/db"
-	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	database "plemya-x.ru/alr/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
+	"plemya-x.ru/alr/internal/types"
 )
 
 // Pull pulls the provided repositories. If a repo doesn't exist, it will be cloned

pkg/repos/utils.go

@@ -1,19 +1,3 @@
-// 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 (
@@ -26,10 +10,9 @@ import (
 	"github.com/go-git/go-git/v5/plumbing/format/diff"
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
-
+	"plemya-x.ru/alr/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"plemya-x.ru/alr/internal/shutils/decoder"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder"
+	"plemya-x.ru/alr/pkg/distro"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 )
 
 // isValid makes sure the path of the file being updated is valid.

pkg/search/search.go

@@ -1,22 +1,3 @@
-// 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 search
 
 import (
@@ -29,8 +10,8 @@ import (
 	"strconv"
 	"strings"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"plemya-x.ru/alr/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"plemya-x.ru/alr/internal/db"
 )
 
 // Filter represents search filters.

repo.go

@@ -1,61 +1,58 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// You should have received a copy of the GNU General Public License
+ */
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package main
 
 import (
-	"log/slog"
 	"os"
 	"path/filepath"
 
-	"github.com/leonelquinteros/gotext"
 	"github.com/pelletier/go-toml/v2"
 	"github.com/urfave/cli/v2"
+	"plemya-x.ru/alr/internal/config"
+	"plemya-x.ru/alr/internal/db"
+	"plemya-x.ru/alr/internal/types"
+	"plemya-x.ru/alr/pkg/loggerctx"
+	"plemya-x.ru/alr/pkg/repos"
 	"golang.org/x/exp/slices"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
 )
 
-func AddRepoCmd() *cli.Command {
+var addrepoCmd = &cli.Command{
-	return &cli.Command{
 	Name:    "addrepo",
-		Usage:   gotext.Get("Add a new repository"),
+	Usage:   "Add a new repository",
 	Aliases: []string{"ar"},
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:     "name",
 			Aliases:  []string{"n"},
 			Required: true,
-				Usage:    gotext.Get("Name of the new repo"),
+			Usage:    "Name of the new repo",
 		},
 		&cli.StringFlag{
 			Name:     "url",
 			Aliases:  []string{"u"},
 			Required: true,
-				Usage:    gotext.Get("URL of the new repo"),
+			Usage:    "URL of the new repo",
 		},
 	},
 	Action: func(c *cli.Context) error {
 		ctx := c.Context
+		log := loggerctx.From(ctx)
 
 		name := c.String("name")
 		repoURL := c.String("url")
@@ -64,8 +61,7 @@ func AddRepoCmd() *cli.Command {
 
 		for _, repo := range cfg.Repos {
 			if repo.URL == repoURL {
-					slog.Error("Repo already exists", "name", repo.Name)
+				log.Fatal("Repo already exists").Str("name", repo.Name).Send()
-					os.Exit(1)
 			}
 		}
 
@@ -76,42 +72,38 @@ func AddRepoCmd() *cli.Command {
 
 		cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath)
 		if err != nil {
-				slog.Error(gotext.Get("Error opening config file"), "err", err)
+			log.Fatal("Error opening config file").Err(err).Send()
-				os.Exit(1)
 		}
 
 		err = toml.NewEncoder(cfgFl).Encode(cfg)
 		if err != nil {
-				slog.Error(gotext.Get("Error encoding config"), "err", err)
+			log.Fatal("Error encoding config").Err(err).Send()
-				os.Exit(1)
 		}
 
 		err = repos.Pull(ctx, cfg.Repos)
 		if err != nil {
-				slog.Error(gotext.Get("Error pulling repos"), "err", err)
+			log.Fatal("Error pulling repos").Err(err).Send()
-				os.Exit(1)
 		}
 
 		return nil
 	},
 }
-}
 
-func RemoveRepoCmd() *cli.Command {
+var removerepoCmd = &cli.Command{
-	return &cli.Command{
 	Name:    "removerepo",
-		Usage:   gotext.Get("Remove an existing repository"),
+	Usage:   "Remove an existing repository",
 	Aliases: []string{"rr"},
 	Flags: []cli.Flag{
 		&cli.StringFlag{
 			Name:     "name",
 			Aliases:  []string{"n"},
 			Required: true,
-				Usage:    gotext.Get("Name of the repo to be deleted"),
+			Usage:    "Name of the repo to be deleted",
 		},
 	},
 	Action: func(c *cli.Context) error {
 		ctx := c.Context
+		log := loggerctx.From(ctx)
 
 		name := c.String("name")
 		cfg := config.Config(ctx)
@@ -125,54 +117,46 @@ func RemoveRepoCmd() *cli.Command {
 			}
 		}
 		if !found {
-				slog.Error(gotext.Get("Repo does not exist"), "name", name)
+			log.Fatal("Repo does not exist").Str("name", name).Send()
-				os.Exit(1)
 		}
 
 		cfg.Repos = slices.Delete(cfg.Repos, index, index+1)
 
 		cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath)
 		if err != nil {
-				slog.Error(gotext.Get("Error opening config file"), "err", err)
+			log.Fatal("Error opening config file").Err(err).Send()
-				os.Exit(1)
 		}
 
 		err = toml.NewEncoder(cfgFl).Encode(&cfg)
 		if err != nil {
-				slog.Error(gotext.Get("Error encoding config"), "err", err)
+			log.Fatal("Error encoding config").Err(err).Send()
-				os.Exit(1)
 		}
 
 		err = os.RemoveAll(filepath.Join(config.GetPaths(ctx).RepoDir, name))
 		if err != nil {
-				slog.Error(gotext.Get("Error removing repo directory"), "err", err)
+			log.Fatal("Error removing repo directory").Err(err).Send()
-				os.Exit(1)
 		}
 
 		err = db.DeletePkgs(ctx, "repository = ?", name)
 		if err != nil {
-				slog.Error(gotext.Get("Error removing packages from database"), "err", err)
+			log.Fatal("Error removing packages from database").Err(err).Send()
-				os.Exit(1)
 		}
 
 		return nil
 	},
 }
-}
 
-func RefreshCmd() *cli.Command {
+var refreshCmd = &cli.Command{
-	return &cli.Command{
 	Name:    "refresh",
-		Usage:   gotext.Get("Pull all repositories that have changed"),
+	Usage:   "Pull all repositories that have changed",
 	Aliases: []string{"ref"},
 	Action: func(c *cli.Context) error {
 		ctx := c.Context
+		log := loggerctx.From(ctx)
 		err := repos.Pull(ctx, config.Config(ctx).Repos)
 		if err != nil {
-				slog.Error(gotext.Get("Error pulling repos"), "err", err)
+			log.Fatal("Error pulling repos").Err(err).Send()
-				os.Exit(1)
 		}
 		return nil
 	},
 }
-}

scripts/install.sh

@@ -1,22 +1,3 @@
-# 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/>.
-
 info() {
   echo $'\x1b[32m[ИНФО]\x1b[0m' $@
 }

upgrade.go

@@ -1,87 +1,74 @@
-// 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) 2024 Евгений Храмов
-// 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
-// This program is free software: you can redistribute it and/or modify
+ * the Free Software Foundation, either version 3 of the License, or
-// it under the terms of the GNU General Public License as published by
+ * (at your option) any later version.
-// 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
-// This program is distributed in the hope that it will be useful,
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * GNU General Public License for more details.
-// 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/>.
-// You should have received a copy of the GNU General Public License
+ */
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package main
 
 import (
 	"context"
 	"fmt"
-	"log/slog"
-	"os"
 
-	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
+	"plemya-x.ru/alr/internal/config"
+	"plemya-x.ru/alr/internal/db"
+	"plemya-x.ru/alr/internal/types"
+	"plemya-x.ru/alr/pkg/build"
+	"plemya-x.ru/alr/pkg/distro"
+	"plemya-x.ru/alr/pkg/loggerctx"
+	"plemya-x.ru/alr/pkg/manager"
+	"plemya-x.ru/alr/pkg/repos"
 	"go.elara.ws/vercmp"
 	"golang.org/x/exp/maps"
 	"golang.org/x/exp/slices"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
 )
 
-func UpgradeCmd() *cli.Command {
+var upgradeCmd = &cli.Command{
-	return &cli.Command{
 	Name:    "upgrade",
-		Usage:   gotext.Get("Upgrade all installed packages"),
+	Usage:   "Upgrade all installed packages",
 	Aliases: []string{"up"},
 	Flags: []cli.Flag{
 		&cli.BoolFlag{
 			Name:    "clean",
 			Aliases: []string{"c"},
-				Usage:   gotext.Get("Build package from scratch even if there's an already built package available"),
+			Usage:   "Build package from scratch even if there's an already built package available",
 		},
 	},
 	Action: func(c *cli.Context) error {
 		ctx := c.Context
-
+		log := loggerctx.From(ctx)
-			cfg := config.GetInstance(ctx)
 
 		info, err := distro.ParseOSRelease(ctx)
 		if err != nil {
-				slog.Error(gotext.Get("Error parsing os-release file"), "err", err)
+			log.Fatal("Error parsing os-release file").Err(err).Send()
-				os.Exit(1)
 		}
 
 		mgr := manager.Detect()
 		if mgr == nil {
-				slog.Error(gotext.Get("Unable to detect a supported package manager on the system"))
+			log.Fatal("Unable to detect a supported package manager on the system").Send()
-				os.Exit(1)
 		}
 
-			if cfg.AutoPull(ctx) {
 		err = repos.Pull(ctx, config.Config(ctx).Repos)
 		if err != nil {
-					slog.Error(gotext.Get("Error pulling repos"), "err", err)
+			log.Fatal("Error pulling repos").Err(err).Send()
-					os.Exit(1)
-				}
 		}
 
 		updates, err := checkForUpdates(ctx, mgr, info)
 		if err != nil {
-				slog.Error(gotext.Get("Error checking for updates"), "err", err)
+			log.Fatal("Error checking for updates").Err(err).Send()
-				os.Exit(1)
 		}
 
 		if len(updates) > 0 {
@@ -91,13 +78,12 @@ func UpgradeCmd() *cli.Command {
 				Interactive: c.Bool("interactive"),
 			})
 		} else {
-				slog.Info(gotext.Get("There is nothing to do."))
+			log.Info("There is nothing to do.").Send()
 		}
 
 		return nil
 	},
 }
-}
 
 func checkForUpdates(ctx context.Context, mgr manager.Manager, info *distro.OSRelease) ([]db.Package, error) {
 	installed, err := mgr.ListInstalled(nil)
@@ -128,12 +114,10 @@ func checkForUpdates(ctx context.Context, mgr manager.Manager, info *distro.OSRe
 		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)
+			repoVer = fmt.Sprintf("%s-%d", pkg.Version, pkg.Release)
 		} else if pkg.Release != 0 && pkg.Epoch != 0 {
-			repoVer = fmt.Sprintf("%d:%s-%s", pkg.Epoch, pkg.Version, releaseStr)
+			repoVer = fmt.Sprintf("%d:%s-%d", pkg.Epoch, pkg.Version, pkg.Release)
 		}
 
 		c := vercmp.Compare(repoVer, installed[pkgName])