.golangci.yml

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

build.go

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

coverage-badge.svg

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

fix.go

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

info.go

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

install.go

@@ -29,10 +29,9 @@ import (
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
 )
@@ -64,52 +63,22 @@ func InstallCmd() *cli.Command {
 				os.Exit(1)
 			}
 
-			cfg := config.New()
+			if config.GetInstance(ctx).AutoPull(ctx) {
-			db := database.New(cfg)
+				err := repos.Pull(ctx, config.Config(ctx).Repos)
-			rs := repos.New(cfg, db)
-			err := db.Init(ctx)
-			if err != nil {
-				slog.Error(gotext.Get("Error initialization database"), "err", err)
-				os.Exit(1)
-			}
-
-			if cfg.AutoPull(ctx) {
-				err := rs.Pull(ctx, cfg.Repos(ctx))
 				if err != nil {
 					slog.Error(gotext.Get("Error pulling repositories"), "err", err)
 					os.Exit(1)
 				}
 			}
 
-			found, notFound, err := rs.FindPkgs(ctx, args.Slice())
+			found, notFound, err := repos.FindPkgs(ctx, args.Slice())
 			if err != nil {
 				slog.Error(gotext.Get("Error finding packages"), "err", err)
 				os.Exit(1)
 			}
 
 			pkgs := cliutils.FlattenPkgs(ctx, found, "install", c.Bool("interactive"))
-
+			build.InstallPkgs(ctx, pkgs, notFound, types.BuildOpts{
-			opts := types.BuildOpts{
-				Manager:     mgr,
-				Clean:       c.Bool("clean"),
-				Interactive: c.Bool("interactive"),
-			}
-
-			info, err := distro.ParseOSRelease(ctx)
-			if err != nil {
-				slog.Error(gotext.Get("Error parsing os release"), "err", err)
-				os.Exit(1)
-			}
-
-			builder := build.NewBuilder(
-				ctx,
-				opts,
-				rs,
-				info,
-				cfg,
-			)
-
-			builder.InstallPkgs(ctx, pkgs, notFound, types.BuildOpts{
 				Manager:     mgr,
 				Clean:       c.Bool("clean"),
 				Interactive: c.Bool("interactive"),
@@ -117,8 +86,6 @@ func InstallCmd() *cli.Command {
 			return nil
 		},
 		BashComplete: func(c *cli.Context) {
-			cfg := config.New()
-			db := database.New(cfg)
 			result, err := db.GetPkgs(c.Context, "true")
 			if err != nil {
 				slog.Error(gotext.Get("Error getting packages"), "err", err)
@@ -127,7 +94,7 @@ func InstallCmd() *cli.Command {
 			defer result.Close()
 
 			for result.Next() {
-				var pkg database.Package
+				var pkg db.Package
 				err = result.StructScan(&pkg)
 				if err != nil {
 					slog.Error(gotext.Get("Error iterating over packages"), "err", err)

internal/config/config.go

@@ -152,13 +152,6 @@ func (c *ALRConfig) Repos(ctx context.Context) []types.Repo {
 	return c.cfg.Repos
 }
 
-func (c *ALRConfig) SetRepos(ctx context.Context, repos []types.Repo) {
-	c.cfgOnce.Do(func() {
-		c.Load(ctx)
-	})
-	c.cfg.Repos = repos
-}
-
 func (c *ALRConfig) IgnorePkgUpdates(ctx context.Context) []string {
 	c.cfgOnce.Do(func() {
 		c.Load(ctx)
@@ -172,24 +165,3 @@ func (c *ALRConfig) AutoPull(ctx context.Context) bool {
 	})
 	return c.cfg.AutoPull
 }
-
-func (c *ALRConfig) PagerStyle(ctx context.Context) string {
-	c.cfgOnce.Do(func() {
-		c.Load(ctx)
-	})
-	return c.cfg.PagerStyle
-}
-
-func (c *ALRConfig) AllowRunAsRoot(ctx context.Context) bool {
-	c.cfgOnce.Do(func() {
-		c.Load(ctx)
-	})
-	return c.cfg.Unsafe.AllowRunAsRoot
-}
-
-func (c *ALRConfig) RootCmd(ctx context.Context) string {
-	c.cfgOnce.Do(func() {
-		c.Load(ctx)
-	})
-	return c.cfg.RootCmd
-}

internal/config/config_legacy.go

@@ -0,0 +1,52 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 Евгений Храмов
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package config
+
+import (
+	"context"
+	"sync"
+
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
+)
+
+// Config returns a ALR configuration struct.
+// The first time it's called, it'll load the config from a file.
+// Subsequent calls will just return the same value.
+//
+// Deprecated: use struct method
+func Config(ctx context.Context) *types.Config {
+	return GetInstance(ctx).cfg
+}
+
+// =======================
+// FOR LEGACY ONLY
+// =======================
+
+var (
+	alrConfig     *ALRConfig
+	alrConfigOnce sync.Once
+)
+
+// Deprecated: For legacy only
+func GetInstance(ctx context.Context) *ALRConfig {
+	alrConfigOnce.Do(func() {
+		alrConfig = New()
+		alrConfig.Load(ctx)
+	})
+
+	return alrConfig
+}

internal/config/lang.go

@@ -0,0 +1,70 @@
+// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
+// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
+//
+// ALR - Any Linux Repository
+// Copyright (C) 2025 Евгений Храмов
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package config
+
+import (
+	"context"
+	"log/slog"
+	"os"
+	"strings"
+	"sync"
+
+	"github.com/leonelquinteros/gotext"
+	"golang.org/x/text/language"
+)
+
+var (
+	langMtx sync.Mutex
+	lang    language.Tag
+	langSet bool
+)
+
+// Language returns the system language.
+// The first time it's called, it'll detect the langauge based on
+// the $LANG environment variable.
+// Subsequent calls will just return the same value.
+func Language(ctx context.Context) language.Tag {
+	langMtx.Lock()
+	if !langSet {
+		syslang := SystemLang()
+		tag, err := language.Parse(syslang)
+		if err != nil {
+			slog.Error(gotext.Get("Error parsing system language"), "err", err)
+			langMtx.Unlock()
+			os.Exit(1)
+		}
+		base, _ := tag.Base()
+		lang = language.Make(base.String())
+		langSet = true
+	}
+	langMtx.Unlock()
+	return lang
+}
+
+// SystemLang returns the system language based on
+// the $LANG environment variable.
+func SystemLang() string {
+	lang := os.Getenv("LANG")
+	lang, _, _ = strings.Cut(lang, ".")
+	if lang == "" || lang == "C" {
+		lang = "en"
+	}
+	return lang
+}

internal/config/paths.go

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

internal/db/db.go

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

internal/db/db_legacy.go

@@ -0,0 +1,106 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 Евгений Храмов
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package db
+
+import (
+	"context"
+	"log/slog"
+	"os"
+	"sync"
+
+	"github.com/jmoiron/sqlx"
+	"github.com/leonelquinteros/gotext"
+
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+)
+
+// DB returns the ALR database.
+// The first time it's called, it opens the SQLite database file.
+// Subsequent calls return the same connection.
+//
+// Deprecated: use struct method
+func DB(ctx context.Context) *sqlx.DB {
+	return GetInstance(ctx).GetConn()
+}
+
+// Close closes the database
+//
+// Deprecated: use struct method
+func Close() error {
+	if database != nil {
+		return database.Close()
+	}
+	return nil
+}
+
+// IsEmpty returns true if the database has no packages in it, otherwise it returns false.
+//
+// Deprecated: use struct method
+func IsEmpty(ctx context.Context) bool {
+	return GetInstance(ctx).IsEmpty(ctx)
+}
+
+// InsertPackage adds a package to the database
+//
+// Deprecated: use struct method
+func InsertPackage(ctx context.Context, pkg Package) error {
+	return GetInstance(ctx).InsertPackage(ctx, pkg)
+}
+
+// GetPkgs returns a result containing packages that match the where conditions
+//
+// Deprecated: use struct method
+func GetPkgs(ctx context.Context, where string, args ...any) (*sqlx.Rows, error) {
+	return GetInstance(ctx).GetPkgs(ctx, where, args...)
+}
+
+// GetPkg returns a single package that matches the where conditions
+//
+// Deprecated: use struct method
+func GetPkg(ctx context.Context, where string, args ...any) (*Package, error) {
+	return GetInstance(ctx).GetPkg(ctx, where, args...)
+}
+
+// DeletePkgs deletes all packages matching the where conditions
+//
+// Deprecated: use struct method
+func DeletePkgs(ctx context.Context, where string, args ...any) error {
+	return GetInstance(ctx).DeletePkgs(ctx, where, args...)
+}
+
+// =======================
+// FOR LEGACY ONLY
+// =======================
+
+var (
+	dbOnce   sync.Once
+	database *Database
+)
+
+// Deprecated: For legacy only
+func GetInstance(ctx context.Context) *Database {
+	dbOnce.Do(func() {
+		cfg := config.GetInstance(ctx)
+		database = New(cfg)
+		err := database.Init(ctx)
+		if err != nil {
+			slog.Error(gotext.Get("Error opening database"), "err", err)
+			os.Exit(1)
+		}
+	})
+	return database
+}

internal/dl/file.go

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

internal/dlcache/dlcache_test.go

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

internal/pager/pager.go

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

internal/shutils/decoder/decoder.go

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

internal/shutils/handlers/nop.go

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

internal/shutils/handlers/restricted.go

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

internal/translations/default.pot

@@ -9,56 +9,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: build.go:44
+#: build.go:41
 msgid "Build a local package"
 msgstr ""
 
-#: build.go:50
+#: build.go:47
 msgid "Path to the build script"
 msgstr ""
 
-#: build.go:55
+#: build.go:52
-msgid "Specify package in script (for multi package script only)"
-msgstr ""
-
-#: build.go:60
 msgid "Name of the package to build and its repo (example: default/go-bin)"
 msgstr ""
 
-#: build.go:65
+#: build.go:57
 msgid ""
 "Build package from scratch even if there's an already built package available"
 msgstr ""
 
-#: build.go:75
+#: build.go:87
-msgid "Error initialization database"
-msgstr ""
-
-#: build.go:105
-msgid "Package not found"
-msgstr ""
-
-#: build.go:123
 msgid "Error pulling repositories"
 msgstr ""
 
-#: build.go:131
+#: build.go:95
 msgid "Unable to detect a supported package manager on the system"
 msgstr ""
 
-#: build.go:137
+#: build.go:107
-msgid "Error parsing os release"
-msgstr ""
-
-#: build.go:158
 msgid "Error building package"
 msgstr ""
 
-#: build.go:165
+#: build.go:114
 msgid "Error getting working directory"
 msgstr ""
 
-#: build.go:174
+#: build.go:123
 msgid "Error moving the package"
 msgstr ""
 
@@ -66,27 +50,27 @@ msgstr ""
 msgid "Attempt to fix problems with ALR"
 msgstr ""
 
-#: fix.go:43
+#: fix.go:44
 msgid "Removing cache directory"
 msgstr ""
 
-#: fix.go:47
+#: fix.go:48
 msgid "Unable to remove cache directory"
 msgstr ""
 
-#: fix.go:51
+#: fix.go:52
 msgid "Rebuilding cache"
 msgstr ""
 
-#: fix.go:55
+#: fix.go:56
 msgid "Unable to create new cache directory"
 msgstr ""
 
-#: fix.go:69
+#: fix.go:62
 msgid "Error pulling repos"
 msgstr ""
 
-#: fix.go:73
+#: fix.go:66
 msgid "Done"
 msgstr ""
 
@@ -114,59 +98,63 @@ msgstr ""
 msgid "No such helper command"
 msgstr ""
 
-#: info.go:43
+#: info.go:42
 msgid "Print information about a package"
 msgstr ""
 
-#: info.go:48
+#: info.go:47
 msgid "Show all information, not just for the current distro"
 msgstr ""
 
-#: info.go:63
+#: info.go:57
-msgid "Error getting packages"
+msgid "Error initialization database"
 msgstr ""
 
-#: info.go:72
+#: info.go:64
-msgid "Error iterating over packages"
-msgstr ""
-
-#: info.go:93
 msgid "Command info expected at least 1 argument, got %d"
 msgstr ""
 
-#: info.go:107
+#: info.go:78
 msgid "Error finding packages"
 msgstr ""
 
-#: info.go:129
+#: info.go:94
 msgid "Error parsing os-release file"
 msgstr ""
 
-#: info.go:138
+#: info.go:103
 msgid "Error resolving overrides"
 msgstr ""
 
-#: info.go:147 info.go:153
+#: info.go:112 info.go:118
 msgid "Error encoding script variables"
 msgstr ""
 
-#: install.go:43
+#: install.go:42
 msgid "Install a new package"
 msgstr ""
 
-#: install.go:57
+#: install.go:56
 msgid "Command install expected at least 1 argument, got %d"
 msgstr ""
 
-#: install.go:146
+#: 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:151
+#: install.go:118
 msgid "Command remove expected at least 1 argument, got %d"
 msgstr ""
 
-#: install.go:163
+#: install.go:130
 msgid "Error removing packages"
 msgstr ""
 
@@ -230,15 +218,23 @@ msgstr ""
 msgid "Unable to create package cache directory"
 msgstr ""
 
-#: internal/db/db.go:133
+#: internal/config/lang.go:49
+msgid "Error parsing system language"
+msgstr ""
+
+#: internal/db/db.go:131
 msgid "Database version mismatch; resetting"
 msgstr ""
 
-#: internal/db/db.go:140
+#: internal/db/db.go:138
 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 ""
@@ -275,92 +271,104 @@ msgstr ""
 msgid "Error listing installed packages"
 msgstr ""
 
-#: main.go:44
+#: main.go:45
 msgid "Print the current ALR version and exit"
 msgstr ""
 
-#: main.go:60
+#: main.go:61
 msgid "Arguments to be passed on to the package manager"
 msgstr ""
 
-#: main.go:66
+#: main.go:67
 msgid "Enable interactive questions and prompts"
 msgstr ""
 
-#: main.go:91
+#: main.go:90
 msgid ""
 "Running ALR as root is forbidden as it may cause catastrophic damage to your "
 "system"
 msgstr ""
 
-#: main.go:123
+#: main.go:124
 msgid "Error while running app"
 msgstr ""
 
-#: pkg/build/build.go:153
+#: pkg/build/build.go:108
 msgid "Failed to prompt user to view build script"
 msgstr ""
 
-#: pkg/build/build.go:157
+#: pkg/build/build.go:112
 msgid "Building package"
 msgstr ""
 
-#: pkg/build/build.go:228
+#: pkg/build/build.go:156
 msgid "Downloading sources"
 msgstr ""
 
-#: pkg/build/build.go:246
+#: pkg/build/build.go:168
 msgid "Building package metadata"
 msgstr ""
 
-#: pkg/build/build.go:268
+#: pkg/build/build.go:190
 msgid "Compressing package"
 msgstr ""
 
-#: pkg/build/build.go:421
+#: pkg/build/build.go:316
 msgid ""
 "Your system's CPU architecture doesn't match this package. Do you want to "
 "build anyway?"
 msgstr ""
 
-#: pkg/build/build.go:435
+#: pkg/build/build.go:327
 msgid "This package is already installed"
 msgstr ""
 
-#: pkg/build/build.go:459
+#: pkg/build/build.go:355
 msgid "Installing build dependencies"
 msgstr ""
 
-#: pkg/build/build.go:500
+#: pkg/build/build.go:397
 msgid "Installing dependencies"
 msgstr ""
 
-#: pkg/build/build.go:535
+#: pkg/build/build.go:443
-msgid "The checksums array must be the same length as sources"
+msgid "Executing version()"
 msgstr ""
 
-#: pkg/build/build.go:586
+#: pkg/build/build.go:463
-msgid "Would you like to remove the build dependencies?"
+msgid "Updating version"
 msgstr ""
 
-#: pkg/build/build.go:649
+#: pkg/build/build.go:468
 msgid "Executing prepare()"
 msgstr ""
 
-#: pkg/build/build.go:659
+#: pkg/build/build.go:478
 msgid "Executing build()"
 msgstr ""
 
-#: pkg/build/build.go:689 pkg/build/build.go:709
+#: pkg/build/build.go:488
-msgid "Executing %s()"
+msgid "Executing package()"
 msgstr ""
 
-#: pkg/build/build.go:768
+#: pkg/build/build.go:510
-msgid "Error installing native packages"
+msgid "Executing files()"
 msgstr ""
 
-#: pkg/build/build.go:792
+#: pkg/build/build.go:588
-msgid "Error installing package"
+msgid "AutoProv is not implemented for this package format, so it's skipped"
+msgstr ""
+
+#: pkg/build/build.go:599
+msgid "AutoReq is not implemented for this package format, so it's skipped"
+msgstr ""
+
+#: pkg/build/build.go:706
+msgid "Would you like to remove the build dependencies?"
+msgstr ""
+
+#: pkg/build/build.go:812
+msgid "The checksums array must be the same length as sources"
 msgstr ""
 
 #: pkg/build/findDeps.go:35
@@ -375,27 +383,27 @@ msgstr ""
 msgid "Required dependency found"
 msgstr ""
 
-#: pkg/build/utils.go:133
+#: pkg/build/install.go:42
-msgid "AutoProv is not implemented for this package format, so it's skipped"
+msgid "Error installing native packages"
 msgstr ""
 
-#: pkg/build/utils.go:144
+#: pkg/build/install.go:79
-msgid "AutoReq is not implemented for this package format, so it's skipped"
+msgid "Error installing package"
 msgstr ""
 
-#: pkg/repos/pull.go:79
+#: pkg/repos/pull.go:75
 msgid "Pulling repository"
 msgstr ""
 
-#: pkg/repos/pull.go:103
+#: pkg/repos/pull.go:99
 msgid "Repository up to date"
 msgstr ""
 
-#: pkg/repos/pull.go:160
+#: pkg/repos/pull.go:156
 msgid "Git repository does not appear to be a valid ALR repo"
 msgstr ""
 
-#: pkg/repos/pull.go:176
+#: 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."
@@ -413,78 +421,46 @@ msgstr ""
 msgid "URL of the new repo"
 msgstr ""
 
-#: repo.go:82 repo.go:147
+#: repo.go:79 repo.go:136
 msgid "Error opening config file"
 msgstr ""
 
-#: repo.go:88 repo.go:153
+#: repo.go:85 repo.go:142
 msgid "Error encoding config"
 msgstr ""
 
-#: repo.go:113
+#: repo.go:103
 msgid "Remove an existing repository"
 msgstr ""
 
-#: repo.go:120
+#: repo.go:110
 msgid "Name of the repo to be deleted"
 msgstr ""
 
-#: repo.go:139
+#: repo.go:128
 msgid "Repo does not exist"
 msgstr ""
 
-#: repo.go:159
+#: repo.go:148
 msgid "Error removing repo directory"
 msgstr ""
 
-#: repo.go:170
+#: repo.go:154
 msgid "Error removing packages from database"
 msgstr ""
 
-#: repo.go:182
+#: repo.go:166
 msgid "Pull all repositories that have changed"
 msgstr ""
 
-#: search.go:36
-msgid "Search packages"
-msgstr ""
-
-#: search.go:42
-msgid "Search by name"
-msgstr ""
-
-#: search.go:47
-msgid "Search by description"
-msgstr ""
-
-#: search.go:52
-msgid "Search by repository"
-msgstr ""
-
-#: search.go:57
-msgid "Search by provides"
-msgstr ""
-
-#: search.go:62
-msgid "Format output using a Go template"
-msgstr ""
-
-#: search.go:82 search.go:99
-msgid "Error parsing format template"
-msgstr ""
-
-#: search.go:107
-msgid "Error executing template"
-msgstr ""
-
 #: upgrade.go:47
 msgid "Upgrade all installed packages"
 msgstr ""
 
-#: upgrade.go:90
+#: upgrade.go:83
 msgid "Error checking for updates"
 msgstr ""
 
-#: upgrade.go:112
+#: upgrade.go:94
 msgid "There is nothing to do."
 msgstr ""

internal/translations/po/ru/default.po

@@ -16,57 +16,40 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Gtranslator 47.1\n"
 
-#: build.go:44
+#: build.go:41
 msgid "Build a local package"
 msgstr "Сборка локального пакета"
 
-#: build.go:50
+#: build.go:47
 msgid "Path to the build script"
 msgstr "Путь к скрипту сборки"
 
-#: build.go:55
+#: build.go:52
-msgid "Specify package in script (for multi package script only)"
-msgstr ""
-
-#: build.go:60
 msgid "Name of the package to build and its repo (example: default/go-bin)"
 msgstr "Имя пакета для сборки и его репозиторий (пример: default/go-bin)"
 
-#: build.go:65
+#: build.go:57
 msgid ""
 "Build package from scratch even if there's an already built package available"
 msgstr "Создайте пакет с нуля, даже если уже имеется готовый пакет"
 
-#: build.go:75
+#: build.go:87
-msgid "Error initialization database"
-msgstr "Ошибка инициализации базы данных"
-
-#: build.go:105
-msgid "Package not found"
-msgstr ""
-
-#: build.go:123
 msgid "Error pulling repositories"
 msgstr "Ошибка при извлечении репозиториев"
 
-#: build.go:131
+#: build.go:95
 msgid "Unable to detect a supported package manager on the system"
 msgstr "Не удалось обнаружить поддерживаемый менеджер пакетов в системе"
 
-#: build.go:137
+#: build.go:107
-#, fuzzy
-msgid "Error parsing os release"
-msgstr "Ошибка при разборе файла выпуска операционной системы"
-
-#: build.go:158
 msgid "Error building package"
 msgstr "Ошибка при сборке пакета"
 
-#: build.go:165
+#: build.go:114
 msgid "Error getting working directory"
 msgstr "Ошибка при получении рабочего каталога"
 
-#: build.go:174
+#: build.go:123
 msgid "Error moving the package"
 msgstr "Ошибка при перемещении пакета"
 
@@ -74,27 +57,27 @@ msgstr "Ошибка при перемещении пакета"
 msgid "Attempt to fix problems with ALR"
 msgstr "Попытка устранить проблемы с ALR"
 
-#: fix.go:43
+#: fix.go:44
 msgid "Removing cache directory"
 msgstr "Удаление каталога кэша"
 
-#: fix.go:47
+#: fix.go:48
 msgid "Unable to remove cache directory"
 msgstr "Не удалось удалить каталог кэша"
 
-#: fix.go:51
+#: fix.go:52
 msgid "Rebuilding cache"
 msgstr "Восстановление кэша"
 
-#: fix.go:55
+#: fix.go:56
 msgid "Unable to create new cache directory"
 msgstr "Не удалось создать новый каталог кэша"
 
-#: fix.go:69
+#: fix.go:62
 msgid "Error pulling repos"
 msgstr "Ошибка при извлечении репозиториев"
 
-#: fix.go:73
+#: fix.go:66
 msgid "Done"
 msgstr "Сделано"
 
@@ -122,59 +105,63 @@ msgstr "Каталог, в который будут устанавливать
 msgid "No such helper command"
 msgstr "Такой вспомогательной команды нет"
 
-#: info.go:43
+#: info.go:42
 msgid "Print information about a package"
 msgstr "Отобразить информацию о пакете"
 
-#: info.go:48
+#: info.go:47
 msgid "Show all information, not just for the current distro"
 msgstr "Показывать всю информацию, не только для текущего дистрибутива"
 
-#: info.go:63
+#: info.go:57
-msgid "Error getting packages"
+msgid "Error initialization database"
-msgstr "Ошибка при получении пакетов"
+msgstr "Ошибка инициализации базы данных"
 
-#: info.go:72
+#: info.go:64
-msgid "Error iterating over packages"
-msgstr "Ошибка при переборе пакетов"
-
-#: info.go:93
 msgid "Command info expected at least 1 argument, got %d"
 msgstr "Для команды info ожидался хотя бы 1 аргумент, получено %d"
 
-#: info.go:107
+#: info.go:78
 msgid "Error finding packages"
 msgstr "Ошибка при поиске пакетов"
 
-#: info.go:129
+#: info.go:94
 msgid "Error parsing os-release file"
 msgstr "Ошибка при разборе файла выпуска операционной системы"
 
-#: info.go:138
+#: info.go:103
 msgid "Error resolving overrides"
 msgstr "Ошибка устранения переорпеделений"
 
-#: info.go:147 info.go:153
+#: info.go:112 info.go:118
 msgid "Error encoding script variables"
 msgstr "Ошибка кодирования переменных скрита"
 
-#: install.go:43
+#: install.go:42
 msgid "Install a new package"
 msgstr "Установить новый пакет"
 
-#: install.go:57
+#: install.go:56
 msgid "Command install expected at least 1 argument, got %d"
 msgstr "Для команды install ожидался хотя бы 1 аргумент, получено %d"
 
-#: install.go:146
+#: 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:151
+#: install.go:118
 msgid "Command remove expected at least 1 argument, got %d"
 msgstr "Для команды remove ожидался хотя бы 1 аргумент, получено %d"
 
-#: install.go:163
+#: install.go:130
 msgid "Error removing packages"
 msgstr "Ошибка при удалении пакетов"
 
@@ -242,16 +229,24 @@ msgstr "Не удалось создать каталог кэша репози
 msgid "Unable to create package cache directory"
 msgstr "Не удалось создать каталог кэша пакетов"
 
-#: internal/db/db.go:133
+#: internal/config/lang.go:49
+msgid "Error parsing system language"
+msgstr "Ошибка при парсинге языка системы"
+
+#: internal/db/db.go:131
 msgid "Database version mismatch; resetting"
 msgstr "Несоответствие версий базы данных; сброс настроек"
 
-#: internal/db/db.go:140
+#: internal/db/db.go:138
 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 "Исходный код можно обновлять, обновляя при необходимости"
@@ -288,19 +283,19 @@ msgstr "Список пакетов репозитория ALR"
 msgid "Error listing installed packages"
 msgstr "Ошибка при составлении списка установленных пакетов"
 
-#: main.go:44
+#: main.go:45
 msgid "Print the current ALR version and exit"
 msgstr "Показать текущую версию ALR и выйти"
 
-#: main.go:60
+#: main.go:61
 msgid "Arguments to be passed on to the package manager"
 msgstr "Аргументы, которые будут переданы менеджеру пакетов"
 
-#: main.go:66
+#: main.go:67
 msgid "Enable interactive questions and prompts"
 msgstr "Включение интерактивных вопросов и запросов"
 
-#: main.go:91
+#: main.go:90
 msgid ""
 "Running ALR as root is forbidden as it may cause catastrophic damage to your "
 "system"
@@ -308,31 +303,31 @@ msgstr ""
 "Запуск ALR от имени root запрещён, так как это может привести к "
 "катастрофическому повреждению вашей системы"
 
-#: main.go:123
+#: main.go:124
 msgid "Error while running app"
 msgstr "Ошибка при запуске приложения"
 
-#: pkg/build/build.go:153
+#: pkg/build/build.go:108
 msgid "Failed to prompt user to view build script"
 msgstr "Не удалось предложить пользователю просмотреть скрипт сборки"
 
-#: pkg/build/build.go:157
+#: pkg/build/build.go:112
 msgid "Building package"
 msgstr "Сборка пакета"
 
-#: pkg/build/build.go:228
+#: pkg/build/build.go:156
 msgid "Downloading sources"
 msgstr "Скачивание источников"
 
-#: pkg/build/build.go:246
+#: pkg/build/build.go:168
 msgid "Building package metadata"
 msgstr "Сборка метаданных пакета"
 
-#: pkg/build/build.go:268
+#: pkg/build/build.go:190
 msgid "Compressing package"
 msgstr "Сжатие пакета"
 
-#: pkg/build/build.go:421
+#: pkg/build/build.go:316
 msgid ""
 "Your system's CPU architecture doesn't match this package. Do you want to "
 "build anyway?"
@@ -340,46 +335,59 @@ msgstr ""
 "Архитектура процессора вашей системы не соответствует этому пакету. Вы все "
 "равно хотите выполнить сборку?"
 
-#: pkg/build/build.go:435
+#: pkg/build/build.go:327
 msgid "This package is already installed"
 msgstr "Этот пакет уже установлен"
 
-#: pkg/build/build.go:459
+#: pkg/build/build.go:355
 msgid "Installing build dependencies"
 msgstr "Установка зависимостей сборки"
 
-#: pkg/build/build.go:500
+#: pkg/build/build.go:397
 msgid "Installing dependencies"
 msgstr "Установка зависимостей"
 
-#: pkg/build/build.go:535
+#: pkg/build/build.go:443
-msgid "The checksums array must be the same length as sources"
+msgid "Executing version()"
-msgstr "Массив контрольных сумм должен быть той же длины, что и источники"
+msgstr "Исполнение версия()"
 
-#: pkg/build/build.go:586
+#: pkg/build/build.go:463
-msgid "Would you like to remove the build dependencies?"
+msgid "Updating version"
-msgstr "Хотели бы вы удалить зависимости сборки?"
+msgstr "Обновление версии"
 
-#: pkg/build/build.go:649
+#: pkg/build/build.go:468
 msgid "Executing prepare()"
 msgstr "Исполнение prepare()"
 
-#: pkg/build/build.go:659
+#: pkg/build/build.go:478
 msgid "Executing build()"
 msgstr "Исполнение build()"
 
-#: pkg/build/build.go:689 pkg/build/build.go:709
+#: pkg/build/build.go:488
-#, fuzzy
+msgid "Executing package()"
-msgid "Executing %s()"
+msgstr "Исполнение package()"
+
+#: pkg/build/build.go:510
+msgid "Executing files()"
 msgstr "Исполнение files()"
 
-#: pkg/build/build.go:768
+#: pkg/build/build.go:588
-msgid "Error installing native packages"
+msgid "AutoProv is not implemented for this package format, so it's skipped"
-msgstr "Ошибка при установке нативных пакетов"
+msgstr ""
+"AutoProv не реализовано для этого формата пакета, поэтому будет пропущено"
 
-#: pkg/build/build.go:792
+#: pkg/build/build.go:599
-msgid "Error installing package"
+msgid "AutoReq is not implemented for this package format, so it's skipped"
-msgstr "Ошибка при установке пакета"
+msgstr ""
+"AutoReq не реализовано для этого формата пакета, поэтому будет пропущено"
+
+#: pkg/build/build.go:706
+msgid "Would you like to remove the build dependencies?"
+msgstr "Хотели бы вы удалить зависимости сборки?"
+
+#: pkg/build/build.go:812
+msgid "The checksums array must be the same length as sources"
+msgstr "Массив контрольных сумм должен быть той же длины, что и источники"
 
 #: pkg/build/findDeps.go:35
 msgid "Command not found on the system"
@@ -393,29 +401,27 @@ msgstr "Найденная предоставленная зависимость
 msgid "Required dependency found"
 msgstr "Найдена требуемая зависимость"
 
-#: pkg/build/utils.go:133
+#: pkg/build/install.go:42
-msgid "AutoProv is not implemented for this package format, so it's skipped"
+msgid "Error installing native packages"
-msgstr ""
+msgstr "Ошибка при установке нативных пакетов"
-"AutoProv не реализовано для этого формата пакета, поэтому будет пропущено"
 
-#: pkg/build/utils.go:144
+#: pkg/build/install.go:79
-msgid "AutoReq is not implemented for this package format, so it's skipped"
+msgid "Error installing package"
-msgstr ""
+msgstr "Ошибка при установке пакета"
-"AutoReq не реализовано для этого формата пакета, поэтому будет пропущено"
 
-#: pkg/repos/pull.go:79
+#: pkg/repos/pull.go:75
 msgid "Pulling repository"
 msgstr "Скачивание репозитория"
 
-#: pkg/repos/pull.go:103
+#: pkg/repos/pull.go:99
 msgid "Repository up to date"
 msgstr "Репозиторий уже обновлён"
 
-#: pkg/repos/pull.go:160
+#: pkg/repos/pull.go:156
 msgid "Git repository does not appear to be a valid ALR repo"
 msgstr "Репозиторий Git не поддерживается репозиторием ALR"
 
-#: pkg/repos/pull.go:176
+#: 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."
@@ -435,96 +441,46 @@ msgstr "Название нового репозитория"
 msgid "URL of the new repo"
 msgstr "URL-адрес нового репозитория"
 
-#: repo.go:82 repo.go:147
+#: repo.go:79 repo.go:136
 msgid "Error opening config file"
 msgstr "Ошибка при открытии конфигурационного файла"
 
-#: repo.go:88 repo.go:153
+#: repo.go:85 repo.go:142
 msgid "Error encoding config"
 msgstr "Ошибка при кодировании конфигурации"
 
-#: repo.go:113
+#: repo.go:103
 msgid "Remove an existing repository"
 msgstr "Удалить существующий репозиторий"
 
-#: repo.go:120
+#: repo.go:110
 msgid "Name of the repo to be deleted"
 msgstr "Название репозитория  удалён"
 
-#: repo.go:139
+#: repo.go:128
 msgid "Repo does not exist"
 msgstr "Репозитория не существует"
 
-#: repo.go:159
+#: repo.go:148
 msgid "Error removing repo directory"
 msgstr "Ошибка при удалении каталога репозитория"
 
-#: repo.go:170
+#: repo.go:154
 msgid "Error removing packages from database"
 msgstr "Ошибка при удалении пакетов из базы данных"
 
-#: repo.go:182
+#: repo.go:166
 msgid "Pull all repositories that have changed"
 msgstr "Скачать все изменённые репозитории"
 
-#: search.go:36
-msgid "Search packages"
-msgstr ""
-
-#: search.go:42
-msgid "Search by name"
-msgstr ""
-
-#: search.go:47
-msgid "Search by description"
-msgstr ""
-
-#: search.go:52
-#, fuzzy
-msgid "Search by repository"
-msgstr "Добавить новый репозиторий"
-
-#: search.go:57
-msgid "Search by provides"
-msgstr ""
-
-#: search.go:62
-msgid "Format output using a Go template"
-msgstr ""
-
-#: search.go:82 search.go:99
-#, fuzzy
-msgid "Error parsing format template"
-msgstr "Ошибка при разборе файла выпуска операционной системы"
-
-#: search.go:107
-#, fuzzy
-msgid "Error executing template"
-msgstr "Ошибка при получении пакетов"
-
 #: upgrade.go:47
 msgid "Upgrade all installed packages"
 msgstr "Обновить все установленные пакеты"
 
-#: upgrade.go:90
+#: upgrade.go:83
 msgid "Error checking for updates"
 msgstr "Ошибка при проверке обновлений"
 
-#: upgrade.go:112
+#: upgrade.go:94
 msgid "There is nothing to do."
 msgstr "Здесь нечего делать."
-
-#~ msgid "Error parsing system language"
-#~ msgstr "Ошибка при парсинге языка системы"
-
-#~ msgid "Error opening database"
-#~ msgstr "Ошибка при открытии базы данных"
-
-#~ msgid "Executing version()"
-#~ msgstr "Исполнение версия()"
-
-#~ msgid "Updating version"
-#~ msgstr "Обновление версии"
-
-#~ msgid "Executing package()"
-#~ msgstr "Исполнение package()"

internal/types/build.go

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

main.go

@@ -32,6 +32,7 @@ import (
 	"github.com/urfave/cli/v2"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/translations"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 
@@ -80,14 +81,12 @@ func GetApp() *cli.App {
 			GenCmd(),
 			HelperCmd(),
 			VersionCmd(),
-			SearchCmd(),
 		},
 		Before: func(c *cli.Context) error {
 			ctx := c.Context
-			cfg := config.New()
 
 			cmd := c.Args().First()
-			if cmd != "helper" && !cfg.AllowRunAsRoot(ctx) && os.Geteuid() == 0 {
+			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"))
 				os.Exit(1)
 			}
@@ -99,6 +98,9 @@ func GetApp() *cli.App {
 
 			return nil
 		},
+		After: func(ctx *cli.Context) error {
+			return db.Close()
+		},
 		EnableBashCompletion: true,
 	}
 }
@@ -108,12 +110,11 @@ func main() {
 	logger.SetupDefault()
 
 	app := GetApp()
-	cfg := config.New()
 
 	ctx := context.Background()
 
 	// Set the root command to the one set in the ALR config
-	manager.DefaultRootCmd = cfg.RootCmd(ctx)
+	manager.DefaultRootCmd = config.Config(ctx).RootCmd
 
 	ctx, cancel := signal.NotifyContext(ctx, syscall.SIGINT, syscall.SIGTERM)
 	defer cancel()

pkg/build/build_internal_test.go

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

pkg/build/install.go

@@ -0,0 +1,84 @@
+// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
+// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
+//
+// ALR - Any Linux Repository
+// Copyright (C) 2025 Евгений Храмов
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package build
+
+import (
+	"context"
+	"log/slog"
+	"os"
+	"path/filepath"
+
+	"github.com/leonelquinteros/gotext"
+
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
+)
+
+// InstallPkgs устанавливает нативные пакеты с использованием менеджера пакетов,
+// затем строит и устанавливает пакеты ALR
+func InstallPkgs(ctx context.Context, alrPkgs []db.Package, nativePkgs []string, opts types.BuildOpts) {
+	if len(nativePkgs) > 0 {
+		err := opts.Manager.Install(nil, nativePkgs...)
+		// Если есть нативные пакеты, выполняем их установку
+		if err != nil {
+			slog.Error(gotext.Get("Error installing native packages"), "err", err)
+			os.Exit(1)
+			// Логируем и завершаем выполнение при ошибке
+		}
+	}
+
+	InstallScripts(ctx, GetScriptPaths(ctx, alrPkgs), opts)
+	// Устанавливаем скрипты сборки через функцию InstallScripts
+}
+
+// GetScriptPaths возвращает срез путей к скриптам, соответствующий
+// данным пакетам
+func GetScriptPaths(ctx context.Context, pkgs []db.Package) []string {
+	var scripts []string
+	for _, pkg := range pkgs {
+		// Для каждого пакета создаем путь к скрипту сборки
+		scriptPath := filepath.Join(config.GetPaths(ctx).RepoDir, pkg.Repository, pkg.Name, "alr.sh")
+		scripts = append(scripts, scriptPath)
+	}
+	return scripts
+}
+
+// InstallScripts строит и устанавливает переданные alr скрипты сборки
+func InstallScripts(ctx context.Context, scripts []string, opts types.BuildOpts) {
+	for _, script := range scripts {
+		opts.Script = script // Устанавливаем текущий скрипт в опции
+		builtPkgs, _, err := BuildPackage(ctx, opts)
+		// Выполняем сборку пакета
+		if err != nil {
+			slog.Error(gotext.Get("Error building package"), "err", err)
+			os.Exit(1)
+			// Логируем и завершаем выполнение при ошибке сборки
+		}
+
+		err = opts.Manager.InstallLocal(nil, builtPkgs...)
+		// Устанавливаем локально собранные пакеты
+		if err != nil {
+			slog.Error(gotext.Get("Error installing package"), "err", err)
+			os.Exit(1)
+			// Логируем и завершаем выполнение при ошибке установки
+		}
+	}
+}

pkg/build/utils.go

@@ -1,423 +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"
-	"io"
-	"log/slog"
-	"os"
-	"path/filepath"
-	"runtime"
-	"slices"
-	"strconv"
-	"strings"
-
-	// Импортируем пакеты для поддержки различных форматов пакетов (APK, DEB, RPM и ARCH).
-
-	_ "github.com/goreleaser/nfpm/v2/apk"
-	_ "github.com/goreleaser/nfpm/v2/arch"
-	_ "github.com/goreleaser/nfpm/v2/deb"
-	_ "github.com/goreleaser/nfpm/v2/rpm"
-	"github.com/leonelquinteros/gotext"
-	"mvdan.cc/sh/v3/syntax"
-
-	"github.com/goreleaser/nfpm/v2"
-	"github.com/goreleaser/nfpm/v2/files"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
-)
-
-// Функция readScript анализирует скрипт сборки с использованием встроенной реализации bash
-func readScript(script string) (*syntax.File, error) {
-	fl, err := os.Open(script) // Открываем файл скрипта
-	if err != nil {
-		return nil, err
-	}
-	defer fl.Close() // Закрываем файл после выполнения
-
-	file, err := syntax.NewParser().Parse(fl, "alr.sh") // Парсим скрипт с помощью синтаксического анализатора
-	if err != nil {
-		return nil, err
-	}
-
-	return file, nil // Возвращаем синтаксическое дерево
-}
-
-// Функция prepareDirs подготавливает директории для сборки.
-func prepareDirs(dirs types.Directories) error {
-	err := os.RemoveAll(dirs.BaseDir) // Удаляем базовую директорию, если она существует
-	if err != nil {
-		return err
-	}
-	err = os.MkdirAll(dirs.SrcDir, 0o755) // Создаем директорию для источников
-	if err != nil {
-		return err
-	}
-	return os.MkdirAll(dirs.PkgDir, 0o755) // Создаем директорию для пакетов
-}
-
-// Функция buildPkgMetadata создает метаданные для пакета, который будет собран.
-func buildPkgMetadata(
-	ctx context.Context,
-	vars *types.BuildVars,
-	dirs types.Directories,
-	pkgFormat string,
-	info *distro.OSRelease,
-	deps []string,
-	preferedContents *[]string,
-) (*nfpm.Info, error) {
-	pkgInfo := getBasePkgInfo(vars, info)
-	pkgInfo.Description = vars.Description
-	pkgInfo.Platform = "linux"
-	pkgInfo.Homepage = vars.Homepage
-	pkgInfo.License = strings.Join(vars.Licenses, ", ")
-	pkgInfo.Maintainer = vars.Maintainer
-	pkgInfo.Overridables = nfpm.Overridables{
-		Conflicts: vars.Conflicts,
-		Replaces:  vars.Replaces,
-		Provides:  vars.Provides,
-		Depends:   deps,
-	}
-
-	if pkgFormat == "apk" {
-		// Alpine отказывается устанавливать пакеты, которые предоставляют сами себя, поэтому удаляем такие элементы
-		pkgInfo.Overridables.Provides = slices.DeleteFunc(pkgInfo.Overridables.Provides, func(s string) bool {
-			return s == pkgInfo.Name
-		})
-	}
-
-	if vars.Epoch != 0 {
-		pkgInfo.Epoch = strconv.FormatUint(uint64(vars.Epoch), 10)
-	}
-
-	setScripts(vars, pkgInfo, dirs.ScriptDir)
-
-	if slices.Contains(vars.Architectures, "all") {
-		pkgInfo.Arch = "all"
-	}
-
-	contents, err := buildContents(vars, dirs, preferedContents)
-	if err != nil {
-		return nil, err
-	}
-	pkgInfo.Overridables.Contents = contents
-
-	if len(vars.AutoProv) == 1 && decoder.IsTruthy(vars.AutoProv[0]) {
-		if pkgFormat == "rpm" {
-			err = rpmFindProvides(ctx, pkgInfo, dirs)
-			if err != nil {
-				return nil, err
-			}
-		} else {
-			slog.Info(gotext.Get("AutoProv is not implemented for this package format, so it's skipped"))
-		}
-	}
-
-	if len(vars.AutoReq) == 1 && decoder.IsTruthy(vars.AutoReq[0]) {
-		if pkgFormat == "rpm" {
-			err = rpmFindRequires(ctx, pkgInfo, dirs)
-			if err != nil {
-				return nil, err
-			}
-		} else {
-			slog.Info(gotext.Get("AutoReq is not implemented for this package format, so it's skipped"))
-		}
-	}
-
-	return pkgInfo, nil
-}
-
-// Функция buildContents создает секцию содержимого пакета, которая содержит файлы,
-// которые будут включены в конечный пакет.
-func buildContents(vars *types.BuildVars, dirs types.Directories, preferedContents *[]string) ([]*files.Content, error) {
-	contents := []*files.Content{}
-
-	processPath := func(path, trimmed string, prefered bool) error {
-		fi, err := os.Lstat(path)
-		if err != nil {
-			return err
-		}
-
-		if fi.IsDir() {
-			f, err := os.Open(path)
-			if err != nil {
-				return err
-			}
-			defer f.Close()
-
-			if !prefered {
-				_, err = f.Readdirnames(1)
-				if err != io.EOF {
-					return nil
-				}
-			}
-
-			contents = append(contents, &files.Content{
-				Source:      path,
-				Destination: trimmed,
-				Type:        "dir",
-				FileInfo: &files.ContentFileInfo{
-					MTime: fi.ModTime(),
-				},
-			})
-			return nil
-		}
-
-		if fi.Mode()&os.ModeSymlink != 0 {
-			link, err := os.Readlink(path)
-			if err != nil {
-				return err
-			}
-			link = strings.TrimPrefix(link, dirs.PkgDir)
-
-			contents = append(contents, &files.Content{
-				Source:      link,
-				Destination: trimmed,
-				Type:        "symlink",
-				FileInfo: &files.ContentFileInfo{
-					MTime: fi.ModTime(),
-					Mode:  fi.Mode(),
-				},
-			})
-			return nil
-		}
-
-		fileContent := &files.Content{
-			Source:      path,
-			Destination: trimmed,
-			FileInfo: &files.ContentFileInfo{
-				MTime: fi.ModTime(),
-				Mode:  fi.Mode(),
-				Size:  fi.Size(),
-			},
-		}
-
-		if slices.Contains(vars.Backup, trimmed) {
-			fileContent.Type = "config|noreplace"
-		}
-
-		contents = append(contents, fileContent)
-		return nil
-	}
-
-	if preferedContents != nil {
-		for _, trimmed := range *preferedContents {
-			path := filepath.Join(dirs.PkgDir, trimmed)
-			if err := processPath(path, trimmed, true); err != nil {
-				return nil, err
-			}
-		}
-	} else {
-		err := filepath.Walk(dirs.PkgDir, func(path string, fi os.FileInfo, err error) error {
-			if err != nil {
-				return err
-			}
-			trimmed := strings.TrimPrefix(path, dirs.PkgDir)
-			return processPath(path, trimmed, false)
-		})
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return contents, nil
-}
-
-// Функция checkForBuiltPackage пытается обнаружить ранее собранный пакет и вернуть его путь
-// и true, если нашла. Если нет, возвратит "", false, nil.
-func checkForBuiltPackage(
-	mgr manager.Manager,
-	vars *types.BuildVars,
-	pkgFormat,
-	baseDir string,
-	info *distro.OSRelease,
-) (string, bool, error) {
-	filename, err := pkgFileName(vars, pkgFormat, info)
-	if err != nil {
-		return "", false, err
-	}
-
-	pkgPath := filepath.Join(baseDir, filename)
-
-	_, err = os.Stat(pkgPath)
-	if err != nil {
-		return "", false, nil
-	}
-
-	return pkgPath, true, nil
-}
-
-func getBasePkgInfo(vars *types.BuildVars, info *distro.OSRelease) *nfpm.Info {
-	return &nfpm.Info{
-		Name:    vars.Name,
-		Arch:    cpu.Arch(),
-		Version: vars.Version,
-		Release: overrides.ReleasePlatformSpecific(vars.Release, info),
-		Epoch:   strconv.FormatUint(uint64(vars.Epoch), 10),
-	}
-}
-
-// pkgFileName returns the filename of the package if it were to be built.
-// This is used to check if the package has already been built.
-func pkgFileName(vars *types.BuildVars, pkgFormat string, info *distro.OSRelease) (string, error) {
-	pkgInfo := getBasePkgInfo(vars, info)
-
-	packager, err := nfpm.Get(pkgFormat)
-	if err != nil {
-		return "", err
-	}
-
-	return packager.ConventionalFileName(pkgInfo), nil
-}
-
-// Функция getPkgFormat возвращает формат пакета из менеджера пакетов,
-// или ALR_PKG_FORMAT, если он установлен.
-func getPkgFormat(mgr manager.Manager) string {
-	pkgFormat := mgr.Format()
-	if format, ok := os.LookupEnv("ALR_PKG_FORMAT"); ok {
-		pkgFormat = format
-	}
-	return pkgFormat
-}
-
-// Функция createBuildEnvVars создает переменные окружения, которые будут установлены
-// в скрипте сборки при его выполнении.
-func createBuildEnvVars(info *distro.OSRelease, dirs types.Directories) []string {
-	env := os.Environ()
-
-	env = append(
-		env,
-		"DISTRO_NAME="+info.Name,
-		"DISTRO_PRETTY_NAME="+info.PrettyName,
-		"DISTRO_ID="+info.ID,
-		"DISTRO_VERSION_ID="+info.VersionID,
-		"DISTRO_ID_LIKE="+strings.Join(info.Like, " "),
-		"ARCH="+cpu.Arch(),
-		"NCPU="+strconv.Itoa(runtime.NumCPU()),
-	)
-
-	if dirs.ScriptDir != "" {
-		env = append(env, "scriptdir="+dirs.ScriptDir)
-	}
-
-	if dirs.PkgDir != "" {
-		env = append(env, "pkgdir="+dirs.PkgDir)
-	}
-
-	if dirs.SrcDir != "" {
-		env = append(env, "srcdir="+dirs.SrcDir)
-	}
-
-	return env
-}
-
-// Функция setScripts добавляет скрипты-перехватчики к метаданным пакета.
-func setScripts(vars *types.BuildVars, info *nfpm.Info, scriptDir string) {
-	if vars.Scripts.PreInstall != "" {
-		info.Scripts.PreInstall = filepath.Join(scriptDir, vars.Scripts.PreInstall)
-	}
-
-	if vars.Scripts.PostInstall != "" {
-		info.Scripts.PostInstall = filepath.Join(scriptDir, vars.Scripts.PostInstall)
-	}
-
-	if vars.Scripts.PreRemove != "" {
-		info.Scripts.PreRemove = filepath.Join(scriptDir, vars.Scripts.PreRemove)
-	}
-
-	if vars.Scripts.PostRemove != "" {
-		info.Scripts.PostRemove = filepath.Join(scriptDir, vars.Scripts.PostRemove)
-	}
-
-	if vars.Scripts.PreUpgrade != "" {
-		info.ArchLinux.Scripts.PreUpgrade = filepath.Join(scriptDir, vars.Scripts.PreUpgrade)
-		info.APK.Scripts.PreUpgrade = filepath.Join(scriptDir, vars.Scripts.PreUpgrade)
-	}
-
-	if vars.Scripts.PostUpgrade != "" {
-		info.ArchLinux.Scripts.PostUpgrade = filepath.Join(scriptDir, vars.Scripts.PostUpgrade)
-		info.APK.Scripts.PostUpgrade = filepath.Join(scriptDir, vars.Scripts.PostUpgrade)
-	}
-
-	if vars.Scripts.PreTrans != "" {
-		info.RPM.Scripts.PreTrans = filepath.Join(scriptDir, vars.Scripts.PreTrans)
-	}
-
-	if vars.Scripts.PostTrans != "" {
-		info.RPM.Scripts.PostTrans = filepath.Join(scriptDir, vars.Scripts.PostTrans)
-	}
-}
-
-/*
-// Функция setVersion изменяет переменную версии в скрипте runner.
-// Она используется для установки версии на вывод функции version().
-func setVersion(ctx context.Context, r *interp.Runner, to string) error {
-	fl, err := syntax.NewParser().Parse(strings.NewReader("version='"+to+"'"), "")
-	if err != nil {
-		return err
-	}
-	return r.Run(ctx, fl)
-}
-*/
-// Returns not installed dependencies
-func removeAlreadyInstalled(opts types.BuildOpts, dependencies []string) ([]string, error) {
-	filteredPackages := []string{}
-
-	for _, dep := range dependencies {
-		installed, err := opts.Manager.IsInstalled(dep)
-		if err != nil {
-			return nil, err
-		}
-		if installed {
-			continue
-		}
-		filteredPackages = append(filteredPackages, dep)
-	}
-
-	return filteredPackages, nil
-}
-
-// Функция packageNames возвращает имена всех предоставленных пакетов.
-func packageNames(pkgs []db.Package) []string {
-	names := make([]string, len(pkgs))
-	for i, p := range pkgs {
-		names[i] = p.Name
-	}
-	return names
-}
-
-// Функция removeDuplicates убирает любые дубликаты из предоставленного среза.
-func removeDuplicates(slice []string) []string {
-	seen := map[string]struct{}{}
-	result := []string{}
-
-	for _, s := range slice {
-		if _, ok := seen[s]; !ok {
-			seen[s] = struct{}{}
-			result = append(result, s)
-		}
-	}
-
-	return result
-}

pkg/distro/osrelease.go

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

pkg/repos/pull.go

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

pkg/repos/pull_internal_test.go

@@ -1,173 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 Евгений Храмов
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package repos
-
-import (
-	"context"
-	"io"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
-)
-
-type TestALRConfig struct{}
-
-func (c *TestALRConfig) GetPaths(ctx context.Context) *config.Paths {
-	return &config.Paths{
-		DBPath: ":memory:",
-	}
-}
-
-func (c *TestALRConfig) Repos(ctx context.Context) []types.Repo {
-	return []types.Repo{
-		{
-			Name: "test",
-			URL:  "https://test",
-		},
-	}
-}
-
-func createReadCloserFromString(input string) io.ReadCloser {
-	reader := strings.NewReader(input)
-	return struct {
-		io.Reader
-		io.Closer
-	}{
-		Reader: reader,
-		Closer: io.NopCloser(reader),
-	}
-}
-
-func TestUpdatePkg(t *testing.T) {
-	type testCase struct {
-		name   string
-		file   string
-		verify func(context.Context, *db.Database)
-	}
-
-	repo := types.Repo{
-		Name: "test",
-		URL:  "https://test",
-	}
-
-	for _, tc := range []testCase{
-		{
-			name: "single package",
-			file: `name=foo
-version='0.0.1'
-release=1
-desc="main desc"
-deps=('sudo')
-build_deps=('golang')
-`,
-			verify: func(ctx context.Context, database *db.Database) {
-				result, err := database.GetPkgs(ctx, "1 = 1")
-				assert.NoError(t, err)
-				pkgCount := 0
-				for result.Next() {
-					var dbPkg db.Package
-					err = result.StructScan(&dbPkg)
-					if err != nil {
-						t.Errorf("Expected no error, got %s", err)
-					}
-
-					assert.Equal(t, "foo", dbPkg.Name)
-					assert.Equal(t, db.NewJSON(map[string]string{"": "main desc"}), dbPkg.Description)
-					assert.Equal(t, db.NewJSON(map[string][]string{"": {"sudo"}}), dbPkg.Depends)
-					pkgCount++
-				}
-				assert.Equal(t, 1, pkgCount)
-			},
-		},
-		{
-			name: "multiple package",
-			file: `basepkg_name=foo
-name=(
-	bar
-	buz
-)
-version='0.0.1'
-release=1
-desc="main desc"
-deps=('sudo')
-build_deps=('golang')
-		
-meta_bar() {
-	desc="foo desc"
-}
-			
-meta_buz() {
-	deps+=('doas')
-}
-`,
-			verify: func(ctx context.Context, database *db.Database) {
-				result, err := database.GetPkgs(ctx, "1 = 1")
-				assert.NoError(t, err)
-
-				pkgCount := 0
-				for result.Next() {
-					var dbPkg db.Package
-					err = result.StructScan(&dbPkg)
-					if err != nil {
-						t.Errorf("Expected no error, got %s", err)
-					}
-					if dbPkg.Name == "bar" {
-						assert.Equal(t, db.NewJSON(map[string]string{"": "foo desc"}), dbPkg.Description)
-						assert.Equal(t, db.NewJSON(map[string][]string{"": {"sudo"}}), dbPkg.Depends)
-					}
-
-					if dbPkg.Name == "buz" {
-						assert.Equal(t, db.NewJSON(map[string]string{"": "main desc"}), dbPkg.Description)
-						assert.Equal(t, db.NewJSON(map[string][]string{"": {"sudo", "doas"}}), dbPkg.Depends)
-					}
-					pkgCount++
-				}
-				assert.Equal(t, 2, pkgCount)
-			},
-		},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			cfg := &TestALRConfig{}
-			ctx := context.Background()
-
-			database := db.New(&TestALRConfig{})
-			database.Init(ctx)
-
-			rs := New(cfg, database)
-
-			path, err := os.MkdirTemp("", "test-update-pkg")
-			assert.NoError(t, err)
-			defer os.RemoveAll(path)
-
-			runner, err := rs.processRepoChangesRunner(path, path)
-			assert.NoError(t, err)
-
-			err = rs.updatePkg(ctx, repo, runner, createReadCloserFromString(
-				tc.file,
-			))
-			assert.NoError(t, err)
-
-			tc.verify(ctx, database)
-		})
-	}
-}

pkg/repos/repos_legacy.go

@@ -0,0 +1,70 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 Евгений Храмов
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package repos
+
+import (
+	"context"
+	"sync"
+
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
+)
+
+// Pull pulls the provided repositories. If a repo doesn't exist, it will be cloned
+// and its packages will be written to the DB. If it does exist, it will be pulled.
+// In this case, only changed packages will be processed if possible.
+// If repos is set to nil, the repos in the ALR config will be used.
+//
+// Deprecated: use struct method
+func Pull(ctx context.Context, repos []types.Repo) error {
+	return GetInstance(ctx).Pull(ctx, repos)
+}
+
+// FindPkgs looks for packages matching the inputs inside the database.
+// It returns a map that maps the package name input to any packages found for it.
+// It also returns a slice that contains the names of all packages that were not found.
+//
+// Deprecated: use struct method
+func FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error) {
+	return GetInstance(ctx).FindPkgs(ctx, pkgs)
+}
+
+// =======================
+// FOR LEGACY ONLY
+// =======================
+
+var (
+	reposInstance *Repos
+	alrConfigOnce sync.Once
+)
+
+// Deprecated: For legacy only
+func GetInstance(ctx context.Context) *Repos {
+	alrConfigOnce.Do(func() {
+		cfg := config.GetInstance(ctx)
+		db := database.GetInstance(ctx)
+
+		reposInstance = New(
+			cfg,
+			db,
+		)
+	})
+
+	return reposInstance
+}

pkg/repos/utils.go

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

pkg/search/search.go

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

pkg/search/search_options_builder.go

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

pkg/search/search_test.go

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

repo.go

@@ -30,7 +30,7 @@ import (
 	"golang.org/x/exp/slices"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
 )
@@ -60,24 +60,21 @@ func AddRepoCmd() *cli.Command {
 			name := c.String("name")
 			repoURL := c.String("url")
 
-			cfg := config.New()
+			cfg := config.Config(ctx)
-			reposSlice := cfg.Repos(ctx)
 
-			for _, repo := range reposSlice {
+			for _, repo := range cfg.Repos {
 				if repo.URL == repoURL {
 					slog.Error("Repo already exists", "name", repo.Name)
 					os.Exit(1)
 				}
 			}
 
-			reposSlice = append(reposSlice, types.Repo{
+			cfg.Repos = append(cfg.Repos, types.Repo{
 				Name: name,
 				URL:  repoURL,
 			})
 
-			cfg.SetRepos(ctx, reposSlice)
+			cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath)
-
-			cfgFl, err := os.Create(cfg.GetPaths(ctx).ConfigPath)
 			if err != nil {
 				slog.Error(gotext.Get("Error opening config file"), "err", err)
 				os.Exit(1)
@@ -89,14 +86,7 @@ func AddRepoCmd() *cli.Command {
 				os.Exit(1)
 			}
 
-			db := database.New(cfg)
+			err = repos.Pull(ctx, cfg.Repos)
-			err = db.Init(ctx)
-			if err != nil {
-				slog.Error(gotext.Get("Error pulling repos"), "err", err)
-			}
-
-			rs := repos.New(cfg, db)
-			err = rs.Pull(ctx, cfg.Repos(ctx))
 			if err != nil {
 				slog.Error(gotext.Get("Error pulling repos"), "err", err)
 				os.Exit(1)
@@ -124,12 +114,11 @@ func RemoveRepoCmd() *cli.Command {
 			ctx := c.Context
 
 			name := c.String("name")
-			cfg := config.New()
+			cfg := config.Config(ctx)
 
 			found := false
 			index := 0
-			reposSlice := cfg.Repos(ctx)
+			for i, repo := range cfg.Repos {
-			for i, repo := range reposSlice {
 				if repo.Name == name {
 					index = i
 					found = true
@@ -140,9 +129,9 @@ func RemoveRepoCmd() *cli.Command {
 				os.Exit(1)
 			}
 
-			cfg.SetRepos(ctx, slices.Delete(reposSlice, index, index+1))
+			cfg.Repos = slices.Delete(cfg.Repos, index, index+1)
 
-			cfgFl, err := os.Create(cfg.GetPaths(ctx).ConfigPath)
+			cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath)
 			if err != nil {
 				slog.Error(gotext.Get("Error opening config file"), "err", err)
 				os.Exit(1)
@@ -154,17 +143,12 @@ func RemoveRepoCmd() *cli.Command {
 				os.Exit(1)
 			}
 
-			err = os.RemoveAll(filepath.Join(cfg.GetPaths(ctx).RepoDir, name))
+			err = os.RemoveAll(filepath.Join(config.GetPaths(ctx).RepoDir, name))
 			if err != nil {
 				slog.Error(gotext.Get("Error removing repo directory"), "err", err)
 				os.Exit(1)
 			}
 
-			db := database.New(cfg)
-			err = db.Init(ctx)
-			if err != nil {
-				os.Exit(1)
-			}
 			err = db.DeletePkgs(ctx, "repository = ?", name)
 			if err != nil {
 				slog.Error(gotext.Get("Error removing packages from database"), "err", err)
@@ -183,14 +167,7 @@ func RefreshCmd() *cli.Command {
 		Aliases: []string{"ref"},
 		Action: func(c *cli.Context) error {
 			ctx := c.Context
-			cfg := config.New()
+			err := repos.Pull(ctx, config.Config(ctx).Repos)
-			db := database.New(cfg)
-			err := db.Init(ctx)
-			if err != nil {
-				os.Exit(1)
-			}
-			rs := repos.New(cfg, db)
-			err = rs.Pull(ctx, cfg.Repos(ctx))
 			if err != nil {
 				slog.Error(gotext.Get("Error pulling repos"), "err", err)
 				os.Exit(1)

search.go

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

upgrade.go

@@ -32,7 +32,7 @@ import (
 	"golang.org/x/exp/slices"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/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"
@@ -56,14 +56,7 @@ func UpgradeCmd() *cli.Command {
 		Action: func(c *cli.Context) error {
 			ctx := c.Context
 
-			cfg := config.New()
+			cfg := config.GetInstance(ctx)
-			db := database.New(cfg)
-			rs := repos.New(cfg, db)
-			err := db.Init(ctx)
-			if err != nil {
-				slog.Error(gotext.Get("Error initialization database"), "err", err)
-				os.Exit(1)
-			}
 
 			info, err := distro.ParseOSRelease(ctx)
 			if err != nil {
@@ -78,32 +71,21 @@ func UpgradeCmd() *cli.Command {
 			}
 
 			if cfg.AutoPull(ctx) {
-				err = rs.Pull(ctx, cfg.Repos(ctx))
+				err = repos.Pull(ctx, config.Config(ctx).Repos)
 				if err != nil {
 					slog.Error(gotext.Get("Error pulling repos"), "err", err)
 					os.Exit(1)
 				}
 			}
 
-			updates, err := checkForUpdates(ctx, mgr, cfg, rs, info)
+			updates, err := checkForUpdates(ctx, mgr, info)
 			if err != nil {
 				slog.Error(gotext.Get("Error checking for updates"), "err", err)
 				os.Exit(1)
 			}
 
 			if len(updates) > 0 {
-				builder := build.NewBuilder(
+				build.InstallPkgs(ctx, updates, nil, types.BuildOpts{
-					ctx,
-					types.BuildOpts{
-						Manager:     mgr,
-						Clean:       c.Bool("clean"),
-						Interactive: c.Bool("interactive"),
-					},
-					rs,
-					info,
-					cfg,
-				)
-				builder.InstallPkgs(ctx, updates, nil, types.BuildOpts{
 					Manager:     mgr,
 					Clean:       c.Bool("clean"),
 					Interactive: c.Bool("interactive"),
@@ -117,33 +99,27 @@ func UpgradeCmd() *cli.Command {
 	}
 }
 
-func checkForUpdates(
+func checkForUpdates(ctx context.Context, mgr manager.Manager, info *distro.OSRelease) ([]db.Package, error) {
-	ctx context.Context,
-	mgr manager.Manager,
-	cfg *config.ALRConfig,
-	rs *repos.Repos,
-	info *distro.OSRelease,
-) ([]database.Package, error) {
 	installed, err := mgr.ListInstalled(nil)
 	if err != nil {
 		return nil, err
 	}
 
 	pkgNames := maps.Keys(installed)
-	found, _, err := rs.FindPkgs(ctx, pkgNames)
+	found, _, err := repos.FindPkgs(ctx, pkgNames)
 	if err != nil {
 		return nil, err
 	}
 
-	var out []database.Package
+	var out []db.Package
 	for pkgName, pkgs := range found {
-		if slices.Contains(cfg.IgnorePkgUpdates(ctx), pkgName) {
+		if slices.Contains(config.Config(ctx).IgnorePkgUpdates, pkgName) {
 			continue
 		}
 
 		if len(pkgs) > 1 {
 			// Puts the element with the highest version first
-			slices.SortFunc(pkgs, func(a, b database.Package) int {
+			slices.SortFunc(pkgs, func(a, b db.Package) int {
 				return vercmp.Compare(a.Version, b.Version)
 			})
 		}