ci: add e2e tests

.gitea/workflows/e2e-tests.yaml

@@ -16,12 +16,11 @@
 
 name: E2E
 
-# on:
-#   push:
-#     branches: [ main ]
-#   pull_request:
 on:
-  workflow_dispatch:
+  push:
+    branches: [ main ]
+  pull_request:
+
 
 jobs:
   tests:
@@ -33,25 +32,18 @@ jobs:
     steps:
       - name: Checkout
         uses: https://github.com/actions/checkout@v4
-        with:
-          fetch-depth: 0
       
       - name: Set up Go
         uses: https://github.com/actions/setup-go@v5
         with:
           go-version: '1.24'
-          cache: false
 
-      # - name: Cache Podman images
+      - name: Start Podman service
-      #   uses: actions/cache@v4
+        run: nohup podman system service -t 0 unix:/tmp/podman.sock &
-      #   with:
-      #     path: |
-      #       ~/.local/share/containers/storage
-      #       /var/lib/containers/storage
-      #     key: ${{ runner.os }}-primes            
 
       - name: Run E2E tests
         env:
+          DOCKER_HOST: unix:/tmp/podman.sock
           IGNORE_ROOT_CHECK: 1
         run: |
           make e2e-test

.gitea/workflows/pre-commit.yaml

@@ -26,8 +26,6 @@ on:
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
-    container:
-      image: docker.gitea.com/runner-images:ubuntu-latest
 
     steps:
       - name: Checkout

.gitea/workflows/release.yaml

@@ -1,120 +0,0 @@
-# ALR - Any Linux Repository
-# Copyright (C) 2025 The ALR Authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-name: Create Release
-
-on:
-  push:
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
-
-jobs:
-  changelog:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout this repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '1.24'
-
-      - name: Get Changes between Tags
-        id: changes
-        uses: simbo/changes-between-tags-action@v1
-
-      - name: Set version
-        run: |
-          version=$(echo "${GITHUB_REF##*/}" | sed 's/^v//')
-          echo "Version - $version"
-          echo "VERSION=$version" >> $GITHUB_ENV
-
-      - name: Prepare for install
-        run: |
-          apt-get update && apt-get install -y libcap2-bin bindfs
-
-      - name: Build alr
-        env:
-          IGNORE_ROOT_CHECK: 1
-        run: |
-          make build
-
-      - name: Create tar.gz
-        run: |
-          mkdir -p ./out/completion
-          cp alr ./out
-          cp scripts/completion/bash ./out/completion/alr
-          cp scripts/completion/zsh ./out/completion/_alr
-
-          ( cd out && tar -czvf ../alr-${{ env.VERSION }}-linux-x86_64.tar.gz * )
-
-      - name: Release
-        uses: akkuman/gitea-release-action@v1
-        with:
-          body: ${{ steps.changes.outputs.changes }}
-          files: |-
-            alr-${{ env.VERSION }}-linux-x86_64.tar.gz
-
-      - name: Checkout alr-default repository
-        uses: actions/checkout@v4
-        with:
-          repository: Plemya-x/alr-default
-          token: ${{ secrets.GITEAPUBLIC }}
-          path: alr-default
-
-      - name: Update version in alr-bin
-        run: |
-          # Замените значения в файле с конфигурацией
-          sed -i "s/version='[0-9]\+\.[0-9]\+\.[0-9]\+'/version='${{ env.VERSION }}'/g" alr-default/alr-bin/alr.sh
-          sed -i "s/release='[0-9]\+'/release='1'/g" alr-default/alr-bin/alr.sh
-
-      - name: Install alr
-        run: |
-          make install
-
-          # temporary fix
-          groupadd wheel
-          usermod -aG wheel root
-
-      - name: Build packages
-        run: |
-          SCRIPT_PATH=alr-default/alr-bin/alr.sh
-          ALR_DISTRO=altlinux ALR_PKG_FORMAT=rpm alr build -s "$SCRIPT_PATH"
-          ALR_PKG_FORMAT=rpm alr build -s "$SCRIPT_PATH"
-          ALR_PKG_FORMAT=deb alr build -s "$SCRIPT_PATH"
-          ALR_PKG_FORMAT=archlinux alr build -s "$SCRIPT_PATH"
-
-      - name: Upload assets
-        uses: akkuman/gitea-release-action@v1
-        with:
-          body: ${{ steps.changes.outputs.changes }}
-          files: |-
-            alr-bin+alr-default_${{ env.VERSION }}-1.red80_amd64.deb \
-            alr-bin+alr-default-${{ env.VERSION }}-1-x86_64.pkg.tar.zst \
-            alr-bin+alr-default-${{ env.VERSION }}-1.red80.x86_64.rpm \
-            alr-bin+alr-default-${{ env.VERSION }}-alt1.x86_64.rpm
-
-      - name: Commit changes
-        run: |
-          cd alr-default
-          git config user.name "gitea"
-          git config user.email "admin@plemya-x.ru"
-          git add .
-          git commit -m "Обновление версии до ${{ env.VERSION }}"
-          git push

.gitea/workflows/update-alr-git.yaml

@@ -1,69 +0,0 @@
-# ALR - Any Linux Repository
-# Copyright (C) 2025 The ALR Authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-name: Update alr-git
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  changelog:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v6
-
-      - name: Setup alr-spec
-        run: |
-          uv tool install alr-spec==0.0.5
-      
-      - name: Install alr
-        run: |
-          apt-get update && apt-get install -y libcap2-bin
-          curl -fsS https://gitea.plemya-x.ru/Plemya-x/ALR/raw/branch/master/scripts/install.sh | bash          
-
-      - name: Checkout this repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set ALR version
-        run: |
-          echo "NEW_ALR_VERSION=$(alr helper git-version)" >> $GITHUB_ENV
-
-      - name: Checkout alr-default repository
-        uses: actions/checkout@v4
-        with:
-          repository: Plemya-x/alr-default
-          token: ${{ secrets.GITEAPUBLIC }}
-          path: alr-default
-
-      - name: Update version
-        working-directory: ./alr-default/alr-git
-        run: |
-          alr-spec set-field version $NEW_ALR_VERSION
-          alr-spec set-field release 1
-
-      - name: Commit changes
-        run: |
-          cd alr-default
-          git config user.name "gitea"
-          git config user.email "admin@plemya-x.ru"
-          git add .
-          git commit -m "Обновление версии до $NEW_ALR_VERSION"
-          git push

Makefile

@@ -24,7 +24,7 @@ $(BIN):
 	go build -ldflags="-X 'gitea.plemya-x.ru/Plemya-x/ALR/internal/config.Version=$(GIT_VERSION)'" -o $@
 
 check-no-root:
-	@if [ "$$IGNORE_ROOT_CHECK" != "1" ] && [ "`whoami`" = "root" ]; then \
+	@if [[ "$(IGNORE_ROOT_CHECK)" != "1" ]] && [[ "$$(whoami)" == 'root' ]]; then \
 		echo "This target shouldn't run as root" 1>&2; \
 		echo "Set IGNORE_ROOT_CHECK=1 to override" 1>&2; \
 		exit 1; \
@@ -39,12 +39,6 @@ install: \
 $(INSTALED_BIN): $(BIN)
 	install -Dm755 $< $@
 	setcap cap_setuid,cap_setgid+ep $(INSTALED_BIN)
-	@if id alr >/dev/null 2>&1; then \
-		echo "User 'alr' already exists. Skipping."; \
-	else \
-		useradd -r -s /usr/sbin/nologin alr; \
-	fi
-	install -d -o alr -g alr -m 755 /var/cache/alr /etc/alr
 
 $(INSTALLED_BASH_COMPLETION): $(BASH_COMPLETION)
 	install -Dm755 $< $@

README.md

@@ -20,10 +20,10 @@ ALR написан на чистом Go и после сборки не имее
 Установочный скрипт автоматически загрузит и установит соответствующий пакет ALR в вашей системе. Чтобы использовать его, просто выполните следующую команду:
 
 ```bash
-curl -fsSL https://gitea.plemya-x.ru/Plemya-x/ALR/raw/branch/master/scripts/install.sh | bash
+curl -fsSL plemya-x.ru/alr/install.sh | bash
 ```
 
-**ВАЖНО**: При этом скрипт будет загружен и запущен [скрипт](https://gitea.plemya-x.ru/Plemya-x/ALR/src/branch/master/scripts/install.sh). Пожалуйста, просматривайте любые скрипты, которые вы скачиваете из Интернета (включая этот), прежде чем запускать их.
+**ВАЖНО**: При этом скрипт будет загружен и запущен с <https://plemya-x.ru/alr/install.sh>. Пожалуйста, просматривайте любые скрипты, которые вы скачиваете из Интернета (включая этот), прежде чем запускать их.
 
 ### Сборка из исходного кода
 
@@ -52,17 +52,9 @@ ALR был создан потому, что упаковка программн
 
 Репозитории alr - это git-хранилища, которые содержат каталог для каждого пакета с файлом `alr.sh` внутри. Файл `alr.sh` содержит все инструкции по сборке пакета и информацию о нем. Скрипты `alr.sh` аналогичны скриптам Aur PKGBUILD. 
 
-Например, репозиторий с ALR [Plemya-x/alr-default](https://gitea.plemya-x.ru/Plemya-x/alr-default.git)
+Например, репозиторий [Plemya-x/alr-repo](https://gitea.plemya-x.ru/Plemya-x/alr-repo.git) можно подключить так:
 ```
-alr repo add alr-default https://gitea.plemya-x.ru/Plemya-x/alr-default.git
+alr addrepo --name alr-repo --url https://gitea.plemya-x.ru/Plemya-x/alr-repo.git
-```
-Репозиторий пакетов [Plemya-x/alr-repo](https://gitea.plemya-x.ru/Plemya-x/alr-repo.git) можно подключить так:
-```
-alr repo add  alr-repo https://gitea.plemya-x.ru/Plemya-x/alr-repo.git
-```
-Репозиторий Linux-Gaming [Plemya-x/alr-LG](https://gitea.plemya-x.ru/Plemya-x/alr-LG.git) можно подключить так:
-```
-alr repo add alr-LG https://gitea.plemya-x.ru/Plemya-x/alr-LG.git
 ```
 
 ---

assets/coverage-badge.svg

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

assets/i18n-ru-badge.svg

@@ -12,7 +12,7 @@
     <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
         <text x="37" y="15" fill="#010101" fill-opacity=".3">ru translate</text>
         <text x="37" y="14">ru translate</text>
-        <text x="100" y="15" fill="#010101" fill-opacity=".3">100.00%</text>
+        <text x="100" y="15" fill="#010101" fill-opacity=".3">96.00%</text>
-        <text x="100" y="14">100.00%</text>
+        <text x="100" y="14">96.00%</text>
     </g>
 </svg>

build.go

@@ -28,12 +28,12 @@ import (
 	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/build"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
 	appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder"
 	"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/internal/utils"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
 )
 
 func BuildCmd() *cli.Command {
@@ -97,7 +97,7 @@ func BuildCmd() *cli.Command {
 			var script string
 			var packages []string
 
-			var res []*build.BuiltDep
+			var res *build.BuildResult
 
 			var scriptArgs *build.BuildPackageFromScriptArgs
 			var dbArgs *build.BuildPackageFromDbArgs
@@ -222,9 +222,9 @@ func BuildCmd() *cli.Command {
 				return cliutils.FormatCliExit(gotext.Get("Error building package"), err)
 			}
 
-			for _, pkg := range res {
+			for _, pkgPath := range res.PackagePaths {
-				name := filepath.Base(pkg.Path)
+				name := filepath.Base(pkgPath)
-				err = osutils.Move(pkg.Path, filepath.Join(wd, name))
+				err = osutils.Move(pkgPath, filepath.Join(wd, name))
 				if err != nil {
 					return cliutils.FormatCliExit(gotext.Get("Error moving the package"), err)
 				}

e2e-tests/bash_completion_test.go

@@ -21,6 +21,7 @@ package e2etests_test
 import (
 	"testing"
 
+	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -30,7 +31,10 @@ func TestE2EBashCompletion(t *testing.T) {
 		"bash-completion",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			execShouldNoError(t, r, "alr", "install", "--generate-bash-completion")
+			err := r.Exec(e2e.NewCommand(
+				"alr", "install", "--generate-bash-completion",
+			))
+			assert.NoError(t, err)
 		},
 	)
 }

e2e-tests/common_test.go

@@ -25,6 +25,7 @@ import (
 	"io"
 	"log"
 	"os"
+	"os/exec"
 	"testing"
 	"time"
 
@@ -120,6 +121,29 @@ var COMMON_SYSTEMS []string = []string{
 	"ubuntu-24.04",
 }
 
+func init() {
+	for _, id := range ALL_SYSTEMS {
+		buildAlrTestImage(id)
+	}
+}
+
+func buildAlrTestImage(id string) {
+	cmd := exec.Command(
+		"docker",
+		"build",
+		"-t", fmt.Sprintf("alr-testimage-%s", id),
+		"-f", fmt.Sprintf("images/Dockerfile.%s", id),
+		".",
+	)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	err := cmd.Run()
+	if err != nil {
+		fmt.Println("Error:", err)
+		return
+	}
+}
+
 func dockerMultipleRun(t *testing.T, name string, ids []string, f func(t *testing.T, runnable e2e.Runnable)) {
 	t.Run(name, func(t *testing.T) {
 		for _, id := range ids {
@@ -134,37 +158,26 @@ func dockerMultipleRun(t *testing.T, name string, ids []string, f func(t *testin
 				e, err := e2e.New(e2e.WithVerbose(), e2e.WithName(fmt.Sprintf("alr-%s", truncatedHash)))
 				assert.NoError(t, err)
 				t.Cleanup(e.Close)
-				imageId := fmt.Sprintf("ghcr.io/maks1ms/alr-e2e-test-image-%s", id)
+				imageId := fmt.Sprintf("alr-testimage-%s", id)
 				runnable := e.Runnable(dockerName).Init(
 					e2e.StartOptions{
 						Image:   imageId,
 						Volumes: []string{
-							"./alr:/tmp/alr",
+							// "./alr:/usr/bin/alr",
 						},
 						Privileged: true,
 					},
 				)
 				assert.NoError(t, e2e.StartAndWaitReady(runnable))
-				err = runnable.Exec(e2e.NewCommand("/bin/alr-test-setup", "alr-install"))
-				if err != nil {
-					panic(err)
-				}
-				err = runnable.Exec(e2e.NewCommand("/bin/alr-test-setup", "passwordless-sudo-setup"))
-				if err != nil {
-					panic(err)
-				}
 				f(t, runnable)
 			})
 		}
 	})
 }
 
-func execShouldNoError(t *testing.T, r e2e.Runnable, cmd string, args ...string) {
+func simpleExec(t *testing.T, r e2e.Runnable, cmd string, args ...string) {
-	assert.NoError(t, r.Exec(e2e.NewCommand(cmd, args...)))
+	err := r.Exec(e2e.NewCommand(cmd, args...))
-}
+	assert.NoError(t, err)
-
-func execShouldError(t *testing.T, r e2e.Runnable, cmd string, args ...string) {
-	assert.Error(t, r.Exec(e2e.NewCommand(cmd, args...)))
 }
 
 func runTestCommands(t *testing.T, r e2e.Runnable, timeout time.Duration, expects []expect.Batcher) {
@@ -181,22 +194,4 @@ func runTestCommands(t *testing.T, r e2e.Runnable, timeout time.Duration, expect
 	assert.NoError(t, err)
 }
 
-const REPO_NAME_FOR_E2E_TESTS = "alr-repo"
+const REPO_FOR_E2E_TESTS = "https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git"
-const REPO_URL_FOR_E2E_TESTS = "https://gitea.plemya-x.ru/Plemya-x/repo-for-tests.git"
-
-func defaultPrepare(t *testing.T, r e2e.Runnable) {
-	execShouldNoError(t, r,
-		"sudo",
-		"alr",
-		"repo",
-		"add",
-		REPO_NAME_FOR_E2E_TESTS,
-		REPO_URL_FOR_E2E_TESTS,
-	)
-
-	execShouldNoError(t, r,
-		"sudo",
-		"alr",
-		"ref",
-	)
-}

e2e-tests/firejailed_package_test.go

@@ -1,41 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 The ALR Authors
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-//go:build e2e
-
-package e2etests_test
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/efficientgo/e2e"
-)
-
-func TestE2EFirejailedPackage(t *testing.T) {
-	dockerMultipleRun(
-		t,
-		"firejailed-package",
-		COMMON_SYSTEMS,
-		func(t *testing.T, r e2e.Runnable) {
-			defaultPrepare(t, r)
-			execShouldNoError(t, r, "alr", "build", "-p", fmt.Sprintf("%s/firejailed-pkg", REPO_NAME_FOR_E2E_TESTS))
-			execShouldError(t, r, "alr", "build", "-p", fmt.Sprintf("%s/firejailed-pkg-incorrect", REPO_NAME_FOR_E2E_TESTS))
-			execShouldNoError(t, r, "sh", "-c", "dpkg -c *.deb | grep -q '/usr/lib/alr/firejailed/_usr_bin_danger.sh'")
-			execShouldNoError(t, r, "sh", "-c", "dpkg -c *.deb | grep -q '/usr/lib/alr/firejailed/_usr_bin_danger.sh.profile'")
-		},
-	)
-}

e2e-tests/group_and_summary_field_test.go

@@ -21,6 +21,7 @@ package e2etests_test
 import (
 	"testing"
 
+	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -30,9 +31,26 @@ func TestE2EGroupAndSummaryField(t *testing.T) {
 		"group-and-summary-field",
 		RPM_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			defaultPrepare(t, r)
+			err := r.Exec(e2e.NewCommand(
-			execShouldNoError(t, r, "sh", "-c", "alr search --name test-group-and-summary --format \"{{.Group.Resolved}}\" | grep ^System/Base$")
+				"sudo",
-			execShouldNoError(t, r, "sh", "-c", "alr search --name test-group-and-summary --format \"{{.Summary.Resolved}}\" | grep \"^Custom summary$\"")
+				"alr",
+				"addrepo",
+				"--name",
+				"alr-repo",
+				"--url",
+				"https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"sh", "-c", "alr search --name test-group-and-summary --format \"{{.Group}}\" | grep ^System/Base$",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"sh", "-c", "alr search --name test-group-and-summary --format \"{{.Summary}}\" | grep \"^Custom summary$\"",
+			))
+			assert.NoError(t, err)
 		},
 	)
 }

e2e-tests/images/Dockerfile.alpine

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

e2e-tests/images/Dockerfile.alt-sisyphus

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

e2e-tests/images/Dockerfile.archlinux

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

e2e-tests/images/Dockerfile.fedora-41

@@ -0,0 +1,18 @@
+FROM fedora:41
+RUN dnf install -y ca-certificates sudo rpm-build bindfs
+RUN <<EOF
+    useradd -m -s /bin/bash -G wheel user
+    echo "user ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/user
+    chmod 0440 /etc/sudoers.d/user
+
+    useradd -m -s /bin/bash alr
+    mkdir -p /var/cache/alr /etc/alr
+    chown alr:alr /var/cache/alr /etc/alr
+EOF
+COPY ./alr /usr/bin
+RUN <<EOF
+    setcap cap_setuid,cap_setgid+ep /usr/bin/alr
+EOF
+USER user
+WORKDIR /home/user
+ENTRYPOINT ["tail", "-f", "/dev/null"]

e2e-tests/images/Dockerfile.opensuse-leap

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

e2e-tests/images/Dockerfile.redos-8

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

e2e-tests/images/Dockerfile.ubuntu-24.04

@@ -0,0 +1,17 @@
+FROM ubuntu:24.10
+RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates sudo libcap2-bin
+RUN <<EOF
+    useradd -m -s /bin/bash user
+    echo "user ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/user
+    chmod 0440 /etc/sudoers.d/user 
+    
+    useradd -m -s /bin/bash alr
+    mkdir -p /var/cache/alr /etc/alr
+    chown alr:alr /var/cache/alr /etc/alr
+EOF
+COPY ./alr /usr/bin
+RUN <<EOF
+    setcap cap_setuid,cap_setgid+ep /usr/bin/alr
+EOF
+USER user
+ENTRYPOINT ["tail", "-f", "/dev/null"]

e2e-tests/issue_32_interactive_test.go

@@ -21,6 +21,7 @@ package e2etests_test
 import (
 	"testing"
 
+	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -30,11 +31,21 @@ func TestE2EIssue32Interactive(t *testing.T) {
 		"issue-32-interactive",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			execShouldNoError(t, r, "alr", "--interactive=false", "remove", "ca-certificates")
+			assert.NoError(t, r.Exec(e2e.NewCommand(
-			execShouldNoError(t, r, "sudo", "alr", "--interactive=false", "remove", "openssl")
+				"sudo", "alr", "--interactive=false", "remove", "ca-certificates",
-			execShouldNoError(t, r, "alr", "fix")
+			)))
-			execShouldNoError(t, r, "sudo", "apt-get", "update")
+
-			execShouldNoError(t, r, "sudo", "alr", "--interactive=false", "install", "ca-certificates")
+			assert.NoError(t, r.Exec(e2e.NewCommand(
+				"sudo", "alr", "--interactive=false", "remove", "openssl",
+			)))
+
+			assert.NoError(t, r.Exec(e2e.NewCommand(
+				"alr", "fix",
+			)))
+
+			assert.NoError(t, r.Exec(e2e.NewCommand(
+				"sudo", "alr", "--interactive=false", "install", "ca-certificates",
+			)))
 		},
 	)
 }

e2e-tests/issue_41_autoreq_skiplist_test.go

@@ -21,6 +21,7 @@ package e2etests_test
 import (
 	"testing"
 
+	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -30,11 +31,51 @@ func TestE2EIssue41AutoreqSkiplist(t *testing.T) {
 		"issue-41-autoreq-skiplist",
 		AUTOREQ_AUTOPROV_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			defaultPrepare(t, r)
+			err := r.Exec(e2e.NewCommand(
-			execShouldNoError(t, r, "alr", "build", "-p", "alr-repo/test-autoreq-autoprov")
+				"sudo",
-			execShouldNoError(t, r, "sh", "-c", "rpm -qp --requires *.rpm | grep \"^/bin/sh$\"")
+				"alr",
-			execShouldError(t, r, "sh", "-c", "rpm -qp --requires *.rpm | grep \"^/bin/bash$\"")
+				"addrepo",
-			execShouldError(t, r, "sh", "-c", "rpm -qp --requires *.rpm | grep \"^/bin/zsh$\"")
+				"--name",
+				"alr-repo",
+				"--url",
+				"https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"alr",
+				"ref",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"alr",
+				"build",
+				"-p",
+				"alr-repo/test-autoreq-autoprov",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"sh",
+				"-c",
+				"rpm -qp --requires *.rpm | grep \"^/bin/sh$\"",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"sh",
+				"-c",
+				"rpm -qp --requires *.rpm | grep \"^/bin/bash$\"",
+			))
+			assert.Error(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"sh",
+				"-c",
+				"rpm -qp --requires *.rpm | grep \"^/bin/zsh$\"",
+			))
+			assert.Error(t, err)
 		},
 	)
 }

e2e-tests/issue_50_install_multiple_test.go

@@ -21,6 +21,7 @@ package e2etests_test
 import (
 	"testing"
 
+	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -30,10 +31,26 @@ func TestE2EIssue50InstallMultiple(t *testing.T) {
 		"issue-50-install-multiple",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			defaultPrepare(t, r)
+			err := r.Exec(e2e.NewCommand(
-			execShouldNoError(t, r, "sudo", "alr", "in", "foo-pkg", "bar-pkg")
+				"sudo",
-			execShouldNoError(t, r, "cat", "/opt/foo")
+				"alr",
-			execShouldNoError(t, r, "cat", "/opt/bar")
+				"addrepo",
+				"--name",
+				"alr-repo",
+				"--url",
+				"https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"sudo", "alr", "in", "foo-pkg", "bar-pkg",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand("cat", "/opt/foo"))
+			assert.NoError(t, err)
+			err = r.Exec(e2e.NewCommand("cat", "/opt/bar"))
+			assert.NoError(t, err)
 		},
 	)
 }

e2e-tests/issue_53_lc_all_c_info_test.go

@@ -21,6 +21,7 @@ package e2etests_test
 import (
 	"testing"
 
+	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -30,8 +31,23 @@ func TestE2EIssue53LcAllCInfo(t *testing.T) {
 		"issue-53-lc-all-c-info",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			defaultPrepare(t, r)
+			err := r.Exec(e2e.NewCommand(
-			execShouldNoError(t, r, "bash", "-c", "LANG=C alr info foo-pkg")
+				"sudo",
+				"alr",
+				"addrepo",
+				"--name",
+				"alr-repo",
+				"--url",
+				"https://gitea.plemya-x.ru/Plemya-x/alr-repo.git",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"bash",
+				"-c",
+				"LANG=C alr info alr-bin",
+			))
+			assert.NoError(t, err)
 		},
 	)
 }

e2e-tests/issue_59_rm_completion_test.go

@@ -21,6 +21,7 @@ package e2etests_test
 import (
 	"testing"
 
+	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -30,11 +31,28 @@ func TestE2EIssue59RmCompletion(t *testing.T) {
 		"issue-59-rm-completion",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			defaultPrepare(t, r)
+			err := r.Exec(e2e.NewCommand(
-			execShouldNoError(t, r, "sudo", "alr", "in", "foo-pkg", "bar-pkg")
+				"sudo",
-			execShouldNoError(t, r, "sh", "-c", "alr rm --generate-bash-completion | grep ^foo-pkg$")
+				"alr",
-			execShouldNoError(t, r, "sh", "-c", "alr rm --generate-bash-completion | grep ^bar-pkg$")
+				"addrepo",
-			execShouldError(t, r, "sh", "-c", "alr rm --generate-bash-completion | grep ^test-autoreq-autoprov$")
+				"--name",
+				"alr-repo",
+				"--url",
+				"https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"sudo", "alr", "in", "foo-pkg", "bar-pkg",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand("sh", "-c", "alr rm --generate-bash-completion | grep ^foo-pkg$"))
+			assert.NoError(t, err)
+			err = r.Exec(e2e.NewCommand("sh", "-c", "alr rm --generate-bash-completion | grep ^bar-pkg$"))
+			assert.NoError(t, err)
+			err = r.Exec(e2e.NewCommand("sh", "-c", "alr rm --generate-bash-completion | grep ^test-autoreq-autoprov$"))
+			assert.Error(t, err)
 		},
 	)
 }

e2e-tests/issue_72_install_with_deps_test.go

@@ -21,6 +21,7 @@ package e2etests_test
 import (
 	"testing"
 
+	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -30,8 +31,21 @@ func TestE2EIssue72InstallWithDeps(t *testing.T) {
 		"issue-72-install-with-deps",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			defaultPrepare(t, r)
+			err := r.Exec(e2e.NewCommand(
-			execShouldNoError(t, r, "sudo", "alr", "in", "test-app-with-lib")
+				"sudo",
+				"alr",
+				"addrepo",
+				"--name",
+				"alr-repo",
+				"--url",
+				"https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"sudo", "alr", "in", "test-app-with-lib",
+			))
+			assert.NoError(t, err)
 		},
 	)
 }

e2e-tests/issue_74_upgradable_test.go

@@ -30,14 +30,21 @@ func TestE2EIssue74Upgradable(t *testing.T) {
 		"issue-74-upgradable",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			defaultPrepare(t, r)
+			simpleExec(t, r, "sudo",
-			execShouldNoError(t, r, "sudo", "alr", "repo", "set-ref", "alr-repo", "bd26236cd7")
+				"alr",
-			execShouldNoError(t, r, "alr", "ref")
+				"addrepo",
-			execShouldNoError(t, r, "sudo", "alr", "in", "bar-pkg")
+				"--name",
-			execShouldNoError(t, r, "sh", "-c", "test $(alr list -U | wc -l) -eq 0 || exit 1")
+				"alr-repo",
-			execShouldNoError(t, r, "sudo", "alr", "repo", "set-ref", "alr-repo", "d9a3541561")
+				"--url",
-			execShouldNoError(t, r, "sudo", "alr", "ref")
+				REPO_FOR_E2E_TESTS,
-			execShouldNoError(t, r, "sh", "-c", "test $(alr list -U | wc -l) -eq 1 || exit 1")
+			)
+			simpleExec(t, r, "sudo", "sh", "-c", "sed -i 's/ref = .*/ref = \"bd26236cd7\"/' /etc/alr/alr.toml")
+			simpleExec(t, r, "alr", "ref")
+			simpleExec(t, r, "sudo", "alr", "in", "bar-pkg")
+			simpleExec(t, r, "sh", "-c", "test $(alr list -U | wc -l) -eq 0 || exit 1")
+			simpleExec(t, r, "sudo", "sh", "-c", "sed -i 's/ref = .*/ref = \"d9a3541561\"/' /etc/alr/alr.toml")
+			simpleExec(t, r, "sudo", "alr", "ref")
+			simpleExec(t, r, "sh", "-c", "test $(alr list -U | wc -l) -eq 1 || exit 1")
 		},
 	)
 }

e2e-tests/issue_75_ref_specify_test.go

@@ -21,6 +21,7 @@ package e2etests_test
 import (
 	"testing"
 
+	"github.com/alecthomas/assert/v2"
 	"github.com/efficientgo/e2e"
 )
 
@@ -30,9 +31,32 @@ func TestE2EIssue75InstallWithDeps(t *testing.T) {
 		"issue-75-ref-specify",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			defaultPrepare(t, r)
+			err := r.Exec(e2e.NewCommand(
-			execShouldNoError(t, r, "sudo", "alr", "repo", "set-ref", "alr-repo", "bd26236cd7")
+				"sudo",
-			execShouldNoError(t, r, "sh", "-c", "test $(alr list | wc -l) -eq 2 || exit 1")
+				"alr",
+				"addrepo",
+				"--name",
+				"alr-repo",
+				"--url",
+				"https://gitea.plemya-x.ru/Maks1mS/repo-for-tests.git",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"sudo", "alr", "ref",
+			))
+			assert.NoError(t, err)
+
+			// TODO: replace with alr command when it be added
+			err = r.Exec(e2e.NewCommand(
+				"sudo", "sh", "-c", "sed -i 's/ref = .*/ref = \"bd26236cd7\"/' /etc/alr/alr.toml",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"sh", "-c", "test $(alr list | wc -l) -eq 2 || exit 1",
+			))
+			assert.NoError(t, err)
 		},
 	)
 }

e2e-tests/issue_76_single_package_repo_test.go

@@ -1,53 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 The ALR Authors
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-//go:build e2e
-
-package e2etests_test
-
-import (
-	"testing"
-
-	"github.com/efficientgo/e2e"
-)
-
-func Test75SinglePackageRepo(t *testing.T) {
-	dockerMultipleRun(
-		t,
-		"issue-76-single-package-repo",
-		COMMON_SYSTEMS,
-		func(t *testing.T, r e2e.Runnable) {
-			execShouldNoError(t, r,
-				"sudo",
-				"alr",
-				"repo",
-				"add",
-				REPO_NAME_FOR_E2E_TESTS,
-				"https://gitea.plemya-x.ru/Maks1mS/test-single-package-alr-repo.git",
-			)
-			execShouldNoError(t, r, "sudo", "alr", "repo", "set-ref", REPO_NAME_FOR_E2E_TESTS, "1075c918be")
-			execShouldNoError(t, r, "alr", "ref")
-			execShouldNoError(t, r, "sudo", "alr", "in", "test-single-repo")
-			execShouldNoError(t, r, "sh", "-c", "alr list -U")
-			execShouldNoError(t, r, "sh", "-c", "test $(alr list -U | wc -l) -eq 0 || exit 1")
-			execShouldNoError(t, r, "sudo", "alr", "repo", "set-ref", REPO_NAME_FOR_E2E_TESTS, "5e361c50d7")
-			execShouldNoError(t, r, "sudo", "alr", "ref")
-			execShouldNoError(t, r, "sh", "-c", "test $(alr list -U | wc -l) -eq 1 || exit 1")
-			execShouldNoError(t, r, "sudo", "alr", "up")
-			execShouldNoError(t, r, "sh", "-c", "test $(alr list -U | wc -l) -eq 0 || exit 1")
-		},
-	)
-}

e2e-tests/issue_81_multiple_packages_test.go

@@ -22,6 +22,7 @@ import (
 	"testing"
 
 	"github.com/efficientgo/e2e"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestE2EIssue81MultiplePackages(t *testing.T) {
@@ -30,9 +31,29 @@ func TestE2EIssue81MultiplePackages(t *testing.T) {
 		"issue-81-multiple-packages",
 		COMMON_SYSTEMS,
 		func(t *testing.T, r e2e.Runnable) {
-			defaultPrepare(t, r)
+			err := r.Exec(e2e.NewCommand(
-			execShouldNoError(t, r, "sudo", "alr", "in", "first-package-with-dashes")
+				"sudo",
-			execShouldNoError(t, r, "cat", "/opt/first-package")
+				"alr",
+				"addrepo",
+				"--name",
+				"alr-repo",
+				"--url",
+				REPO_FOR_E2E_TESTS,
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"sudo", "alr", "ref",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand(
+				"sudo", "alr", "in", "first-package-with-dashes",
+			))
+			assert.NoError(t, err)
+
+			err = r.Exec(e2e.NewCommand("cat", "/opt/first-package"))
+			assert.NoError(t, err)
 		},
 	)
 }

e2e-tests/issue_91_set_repo_ref_test.go

@@ -1,40 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 The ALR Authors
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-//go:build e2e
-
-package e2etests_test
-
-import (
-	"testing"
-
-	"github.com/efficientgo/e2e"
-)
-
-func TestE2EIssue91MultiplePackages(t *testing.T) {
-	dockerMultipleRun(
-		t,
-		"issue-91-set-repo-ref",
-		COMMON_SYSTEMS,
-		func(t *testing.T, r e2e.Runnable) {
-			defaultPrepare(t, r)
-			execShouldError(t, r, "sudo", "alr", "repo", "set-ref")
-			execShouldError(t, r, "sudo", "alr", "repo", "set-ref", "alr-repo")
-			execShouldNoError(t, r, "sudo", "alr", "repo", "set-ref", "alr-repo", "bd26236cd7")
-			execShouldNoError(t, r, "sh", "-c", "test $(alr list | wc -l) -eq 2 || exit 1")
-		},
-	)
-}

e2e-tests/issue_94_twice_build_test.go

@@ -1,49 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 The ALR Authors
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-//go:build e2e
-
-package e2etests_test
-
-import (
-	"bytes"
-	"strings"
-	"testing"
-
-	"github.com/efficientgo/e2e"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestE2EIssue94TwiceBuild(t *testing.T) {
-	dockerMultipleRun(
-		t,
-		"issue-94-twice-build",
-		COMMON_SYSTEMS,
-		func(t *testing.T, r e2e.Runnable) {
-			defaultPrepare(t, r)
-
-			var stderr bytes.Buffer
-			err := r.Exec(
-				e2e.NewCommand("sudo", "alr", "in", "test-94-app"),
-				e2e.WithExecOptionStderr(&stderr),
-			)
-			assert.NoError(t, err, "command failed")
-
-			output := stderr.String()
-			assert.Equal(t, 1, strings.Count(output, "Building package name=test-94-dep"))
-		},
-	)
-}

fix.go

@@ -20,7 +20,6 @@
 package main
 
 import (
-	"io/fs"
 	"log/slog"
 	"os"
 	"path/filepath"
@@ -58,6 +57,7 @@ func FixCmd() *cli.Command {
 			paths := cfg.GetPaths()
 
 			slog.Info(gotext.Get("Clearing cache directory"))
+			// Remove all nested directories of paths.CacheDir
 
 			dir, err := os.Open(paths.CacheDir)
 			if err != nil {
@@ -71,13 +71,7 @@ func FixCmd() *cli.Command {
 			}
 
 			for _, entry := range entries {
-				fullPath := filepath.Join(paths.CacheDir, entry)
+				err = os.RemoveAll(filepath.Join(paths.CacheDir, entry))
-
-				if err := makeWritableRecursive(fullPath); err != nil {
-					slog.Debug("Failed to make path writable", "path", fullPath, "error", err)
-				}
-
-				err = os.RemoveAll(fullPath)
 				if err != nil {
 					return cliutils.FormatCliExit(gotext.Get("Unable to remove cache item (%s)", entry), err)
 				}
@@ -107,23 +101,3 @@ func FixCmd() *cli.Command {
 		},
 	}
 }
-
-func makeWritableRecursive(path string) error {
-	return filepath.WalkDir(path, func(path string, d fs.DirEntry, err error) error {
-		if err != nil {
-			return err
-		}
-
-		info, err := d.Info()
-		if err != nil {
-			return err
-		}
-
-		newMode := info.Mode() | 0o200
-		if d.IsDir() {
-			newMode |= 0o100
-		}
-
-		return os.Chmod(path, newMode)
-	})
-}

gen.go

@@ -25,7 +25,7 @@ import (
 	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/gen"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/gen"
 )
 
 func GenCmd() *cli.Command {

go.mod

@@ -8,6 +8,7 @@ require (
 	gitea.plemya-x.ru/Plemya-x/fakeroot v0.0.2-0.20250408104831-427aaa7713c3
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/PuerkitoBio/purell v1.2.0
+	github.com/alecthomas/assert/v2 v2.2.1
 	github.com/alecthomas/chroma/v2 v2.9.1
 	github.com/caarlos0/env v3.5.0+incompatible
 	github.com/charmbracelet/bubbles v0.20.0
@@ -41,7 +42,6 @@ require (
 	gopkg.in/yaml.v3 v3.0.1
 	modernc.org/sqlite v1.25.0
 	mvdan.cc/sh/v3 v3.10.0
-	xorm.io/xorm v1.3.9
 )
 
 require (
@@ -52,6 +52,7 @@ require (
 	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/ProtonMail/go-crypto v1.1.3 // indirect
+	github.com/alecthomas/repr v0.2.0 // indirect
 	github.com/andybalholm/brotli v1.0.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb // indirect
@@ -78,7 +79,6 @@ require (
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/goccy/go-json v0.8.1 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
@@ -90,10 +90,10 @@ require (
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
+	github.com/hexops/gotextdiff v1.0.3 // indirect
 	github.com/huandu/xstrings v1.3.3 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
@@ -105,8 +105,6 @@ require (
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/termenv v0.15.2 // indirect
@@ -119,10 +117,9 @@ require (
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
-	github.com/shopspring/decimal v1.3.1 // indirect
+	github.com/shopspring/decimal v1.2.0 // indirect
 	github.com/skeema/knownhosts v1.3.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
-	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/therootcompany/xz v1.0.1 // indirect
 	github.com/ulikunitz/xz v0.5.12 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
@@ -148,5 +145,4 @@ require (
 	modernc.org/opt v0.1.3 // indirect
 	modernc.org/strutil v1.1.3 // indirect
 	modernc.org/token v1.0.1 // indirect
-	xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect
 )

go.sum

@@ -17,8 +17,6 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
 dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
 dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
-gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
 gitea.plemya-x.ru/Plemya-x/fakeroot v0.0.2-0.20250408104831-427aaa7713c3 h1:56BjRJJ2Sv50DfSvNUydUMJwwFuiBMWC1uYtH2GYjk8=
 gitea.plemya-x.ru/Plemya-x/fakeroot v0.0.2-0.20250408104831-427aaa7713c3/go.mod h1:iKQM6uttMJgE5CFrPw6SQqAV7TKtlJNICRAie/dTciw=
 github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ=
@@ -139,7 +137,6 @@ github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
 github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
@@ -156,13 +153,10 @@ github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi
 github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
 github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
+github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
-github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/goccy/go-json v0.8.1 h1:4/Wjm0JIJaTDm8K1KcGrLHJoa8EsJ13YWeX+6Kfq6uI=
-github.com/goccy/go-json v0.8.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -182,7 +176,6 @@ github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaW
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -194,7 +187,6 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f h1:5CjVwnuUcp5adK4gmY6i72gpVFVnZDP2h5TmPScB6u4=
 github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod h1:nOFQdrUlIlx6M6ODdSpBj1NVA+VgLC6kmw60mkw34H4=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
@@ -237,8 +229,6 @@ github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUq
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog=
 github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4=
 github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -255,8 +245,6 @@ github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
 github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
@@ -281,9 +269,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leonelquinteros/gotext v1.7.0 h1:jcJmF4AXqyamP7vuw2MMIKs+O3jAEmvrc5JQiI8Ht/8=
 github.com/leonelquinteros/gotext v1.7.0/go.mod h1:qJdoQuERPpccw7L70uoU+K/BvTfRBHYsisCQyFLXyvw=
+github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
-github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
@@ -319,11 +306,6 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
@@ -338,10 +320,6 @@ github.com/nwaples/rardecode/v2 v2.0.0-beta.2 h1:e3mzJFJs4k83GXBEiTaQ5HgSc/kOK8q
 github.com/nwaples/rardecode/v2 v2.0.0-beta.2/go.mod h1:yntwv/HfMc/Hbvtq9I19D1n58te3h6KsqCf3GxyfBGY=
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
 github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
@@ -380,9 +358,8 @@ github.com/sassoftware/go-rpmutils v0.4.0 h1:ojND82NYBxgwrV+mX1CWsd5QJvvEZTKddtC
 github.com/sassoftware/go-rpmutils v0.4.0/go.mod h1:3goNWi7PGAT3/dlql2lv3+MSN5jNYPjT5mVcQcIsYzI=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
+github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
-github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/skeema/knownhosts v1.3.0 h1:AM+y0rI04VksttfwjkSTNQorvGqmwATnvnAHpSgc0LY=
 github.com/skeema/knownhosts v1.3.0/go.mod h1:sPINvnADmT/qYH1kfv+ePMmOBTH6Tbl7b5LvTDjFK7M=
@@ -397,7 +374,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -406,8 +382,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
-github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/tailscale/goexpect v0.0.0-20210902213824-6e8c725cea41 h1:/V2rCMMWcsjYaYO2MeovLw+ClP63OtXgCF2Y1eb8+Ns=
 github.com/tailscale/goexpect v0.0.0-20210902213824-6e8c725cea41/go.mod h1:/roCdA6gg6lQyw/Oz6gIIGu3ggJKYhF+WC/AQReE5XQ=
 github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw=
@@ -479,7 +453,6 @@ golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
 golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -515,7 +488,6 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
 golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -640,13 +612,8 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
@@ -692,7 +659,3 @@ mvdan.cc/sh/v3 v3.10.0/go.mod h1:z/mSSVyLFGZzqb3ZIKojjyqIx/xbmz/UHdCSv9HmqXY=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 h1:bvLlAPW1ZMTWA32LuZMBEGHAUOcATZjzHcotf3SWweM=
-xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
-xorm.io/xorm v1.3.9 h1:TUovzS0ko+IQ1XnNLfs5dqK1cJl1H5uHpWbWqAQ04nU=
-xorm.io/xorm v1.3.9/go.mod h1:LsCCffeeYp63ssk0pKumP6l96WZcHix7ChpurcLNuMw=

info.go

@@ -30,9 +30,9 @@ import (
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
 	appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder"
+	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/utils"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 )
 
@@ -67,8 +67,15 @@ func InfoCmd() *cli.Command {
 			if err != nil {
 				return cliutils.FormatCliExit(gotext.Get("Error getting packages"), err)
 			}
+			defer result.Close()
+
+			for result.Next() {
+				var pkg database.Package
+				err = result.StructScan(&pkg)
+				if err != nil {
+					return cliutils.FormatCliExit(gotext.Get("Error iterating over packages"), err)
+				}
 
-			for _, pkg := range result {
 				fmt.Println(pkg.Name)
 			}
 			return nil
@@ -89,7 +96,6 @@ func InfoCmd() *cli.Command {
 				New(ctx).
 				WithConfig().
 				WithDB().
-				WithDistroInfo().
 				WithRepos().
 				Build()
 			if err != nil {
@@ -138,8 +144,7 @@ func InfoCmd() *cli.Command {
 
 			for _, pkg := range pkgs {
 				if !all {
-					alrsh.ResolvePackage(&pkg, names)
+					err = yaml.NewEncoder(os.Stdout).Encode(overrides.ResolvePackage(&pkg, names))
-					err = yaml.NewEncoder(os.Stdout).Encode(pkg)
 					if err != nil {
 						return cliutils.FormatCliExit(gotext.Get("Error encoding script variables"), err)
 					}

install.go

@@ -25,12 +25,13 @@ import (
 	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/build"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
 	appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/manager"
+	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/utils"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 )
 
 func InstallCmd() *cli.Command {
@@ -97,7 +98,7 @@ func InstallCmd() *cli.Command {
 				return err
 			}
 
-			_, err = builder.InstallPkgs(
+			err = builder.InstallPkgs(
 				ctx,
 				&build.BuildArgs{
 					Opts: &types.BuildOpts{
@@ -135,8 +136,15 @@ func InstallCmd() *cli.Command {
 			if err != nil {
 				return cliutils.FormatCliExit(gotext.Get("Error getting packages"), err)
 			}
+			defer result.Close()
+
+			for result.Next() {
+				var pkg database.Package
+				err = result.StructScan(&pkg)
+				if err != nil {
+					return cliutils.FormatCliExit(gotext.Get("Error iterating over packages"), err)
+				}
 
-			for _, pkg := range result {
 				fmt.Println(pkg.Name)
 			}
 
@@ -182,12 +190,20 @@ func RemoveCmd() *cli.Command {
 			if err != nil {
 				return cliutils.FormatCliExit(gotext.Get("Error getting packages"), err)
 			}
+			defer result.Close()
+
+			for result.Next() {
+				var pkg database.Package
+				err = result.StructScan(&pkg)
+				if err != nil {
+					return cliutils.FormatCliExit(gotext.Get("Error iterating over packages"), err)
+				}
 
-			for _, pkg := range result {
 				_, ok := installedAlrPackages[fmt.Sprintf("%s/%s", pkg.Repository, pkg.Name)]
 				if !ok {
 					continue
 				}
+
 				fmt.Println(pkg.Name)
 			}
 

internal.go

@@ -32,14 +32,14 @@ import (
 	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/build"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
 	appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/constants"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/logger"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/manager"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/utils"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 )
 
 func InternalBuildCmd() *cli.Command {

internal/build/firejail.go

@@ -1,237 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 The ALR Authors
-//
-// 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 (
-	"errors"
-	"fmt"
-	"io"
-	"log/slog"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/goreleaser/nfpm/v2/files"
-	"github.com/leonelquinteros/gotext"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/osutils"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
-)
-
-const (
-	firejailedDir     = "/usr/lib/alr/firejailed"
-	defaultDirMode    = 0o755
-	defaultScriptMode = 0o755
-)
-
-var (
-	ErrInvalidDestination = errors.New("invalid destination path")
-	ErrMissingProfile     = errors.New("default profile is missing")
-	ErrEmptyPackageName   = errors.New("package name cannot be empty")
-)
-
-var binaryDirectories = []string{
-	"/usr/bin/",
-	"/bin/",
-	"/usr/local/bin/",
-}
-
-func applyFirejailIntegration(
-	vars *alrsh.Package,
-	dirs types.Directories,
-	contents []*files.Content,
-) ([]*files.Content, error) {
-	slog.Info(gotext.Get("Applying FireJail integration"), "package", vars.Name)
-
-	if err := createFirejailedDirectory(dirs.PkgDir); err != nil {
-		return nil, fmt.Errorf("failed to create firejailed directory: %w", err)
-	}
-
-	newContents, err := processBinaryFiles(vars, contents, dirs)
-	if err != nil {
-		return nil, fmt.Errorf("failed to process binary files: %w", err)
-	}
-
-	return append(contents, newContents...), nil
-}
-
-func createFirejailedDirectory(pkgDir string) error {
-	firejailedPath := filepath.Join(pkgDir, firejailedDir)
-	return os.MkdirAll(firejailedPath, defaultDirMode)
-}
-
-func processBinaryFiles(pkg *alrsh.Package, contents []*files.Content, dirs types.Directories) ([]*files.Content, error) {
-	var newContents []*files.Content
-
-	for _, content := range contents {
-		if content.Type == "dir" {
-			continue
-		}
-
-		if !isBinaryFile(content.Destination) {
-			slog.Debug("content not binary file", "content", content)
-			continue
-		}
-
-		slog.Debug("process content", "content", content)
-
-		newContent, err := createFirejailedBinary(pkg, content, dirs)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create firejailed binary for %s: %w", content.Destination, err)
-		}
-
-		if newContent != nil {
-			newContents = append(newContents, newContent...)
-		}
-	}
-
-	return newContents, nil
-}
-
-func isBinaryFile(destination string) bool {
-	for _, binDir := range binaryDirectories {
-		if strings.HasPrefix(destination, binDir) {
-			return true
-		}
-	}
-	return false
-}
-
-func createFirejailedBinary(
-	pkg *alrsh.Package,
-	content *files.Content,
-	dirs types.Directories,
-) ([]*files.Content, error) {
-	origFilePath, err := generateFirejailedPath(content.Destination)
-	if err != nil {
-		return nil, err
-	}
-
-	profiles := pkg.FireJailProfiles.Resolved()
-	sourceProfilePath, ok := profiles[content.Destination]
-
-	if !ok {
-		sourceProfilePath, ok = profiles["default"]
-		if !ok {
-			return nil, errors.New("default profile is missing")
-		}
-	}
-
-	sourceProfilePath = filepath.Join(dirs.ScriptDir, sourceProfilePath)
-	dest, err := createFirejailProfilePath(content.Destination)
-	if err != nil {
-		return nil, err
-	}
-
-	err = createProfile(filepath.Join(dirs.PkgDir, dest), sourceProfilePath)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := osutils.Move(content.Source, filepath.Join(dirs.PkgDir, origFilePath)); err != nil {
-		return nil, fmt.Errorf("failed to move original binary: %w", err)
-	}
-
-	// Create wrapper script
-	if err := createWrapperScript(content.Source, origFilePath, dest); err != nil {
-		return nil, fmt.Errorf("failed to create wrapper script: %w", err)
-	}
-
-	profile, err := getContentFromPath(dest, dirs.PkgDir)
-	if err != nil {
-		return nil, err
-	}
-
-	bin, err := getContentFromPath(origFilePath, dirs.PkgDir)
-	if err != nil {
-		return nil, err
-	}
-
-	return []*files.Content{
-		bin,
-		profile,
-	}, nil
-}
-
-func getContentFromPath(path, base string) (*files.Content, error) {
-	absPath := filepath.Join(base, path)
-
-	fi, err := os.Lstat(absPath)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get file info: %w", err)
-	}
-
-	return &files.Content{
-		Source:      absPath,
-		Destination: path,
-		FileInfo: &files.ContentFileInfo{
-			MTime: fi.ModTime(),
-			Mode:  fi.Mode(),
-			Size:  fi.Size(),
-		},
-	}, nil
-}
-
-func generateSafeName(destination string) (string, error) {
-	cleanPath := strings.TrimPrefix(destination, ".")
-	if cleanPath == "" {
-		return "", fmt.Errorf("invalid destination path: %s", destination)
-	}
-	return strings.ReplaceAll(cleanPath, "/", "_"), nil
-}
-
-func generateFirejailedPath(destination string) (string, error) {
-	safeName, err := generateSafeName(destination)
-	if err != nil {
-		return "", err
-	}
-	return filepath.Join(firejailedDir, safeName), nil
-}
-
-func createProfile(destProfilePath, profilePath string) error {
-	srcFile, err := os.Open(profilePath)
-	if err != nil {
-		return err
-	}
-	defer srcFile.Close()
-
-	destFile, err := os.Create(destProfilePath)
-	if err != nil {
-		return err
-	}
-	defer destFile.Close()
-
-	_, err = io.Copy(destFile, srcFile)
-	if err != nil {
-		return err
-	}
-	return destFile.Sync()
-}
-
-func createWrapperScript(scriptPath, origFilePath, profilePath string) error {
-	scriptContent := fmt.Sprintf("#!/bin/bash\nexec firejail --profile=%q %q \"$@\"\n", profilePath, origFilePath)
-	return os.WriteFile(scriptPath, []byte(scriptContent), defaultDirMode)
-}
-
-func createFirejailProfilePath(binaryPath string) (string, error) {
-	name, err := generateSafeName(binaryPath)
-	if err != nil {
-		return "", err
-	}
-	return filepath.Join(firejailedDir, fmt.Sprintf("%s.profile", name)), nil
-}

internal/build/firejail_test.go

@@ -1,316 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 The ALR Authors
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package build
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/goreleaser/nfpm/v2/files"
-	"github.com/stretchr/testify/assert"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
-)
-
-func TestIsBinaryFile(t *testing.T) {
-	tests := []struct {
-		name        string
-		destination string
-		expected    bool
-	}{
-		{"usr/bin binary", "/usr/bin/test", true},
-		{"bin binary", "/bin/test", true},
-		{"usr/local/bin binary", "/usr/local/bin/test", true},
-		{"lib file", "/usr/lib/test.so", false},
-		{"etc file", "/etc/config", false},
-		{"empty destination", "", false},
-		{"root level file", "./test", false},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := isBinaryFile(tt.destination)
-			assert.Equal(t, tt.expected, result)
-		})
-	}
-}
-
-func TestGenerateSafeName(t *testing.T) {
-	tests := []struct {
-		name        string
-		destination string
-		expected    string
-		expectError bool
-	}{
-		{"usr/bin path", "./usr/bin/test", "_usr_bin_test", false},
-		{"bin path", "./bin/test", "_bin_test", false},
-		{"nested path", "./usr/local/bin/app", "_usr_local_bin_app", false},
-		{"path with spaces", "./usr/bin/my app", "_usr_bin_my app", false},
-		{"empty after trim", ".", "", true},
-		{"empty string", "", "", true},
-		{"only dots", "..", ".", false},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result, err := generateSafeName(tt.destination)
-			if tt.expectError {
-				assert.Error(t, err)
-			} else {
-				assert.NoError(t, err)
-				assert.Equal(t, tt.expected, result)
-			}
-		})
-	}
-}
-
-func TestCreateWrapperScript(t *testing.T) {
-	tests := []struct {
-		name            string
-		origFilePath    string
-		profilePath     string
-		expectedContent string
-	}{
-		{
-			"basic wrapper",
-			"/usr/lib/alr/firejailed/_usr_bin_test",
-			"/usr/lib/alr/firejailed/_usr_bin_test.profile",
-			"#!/bin/bash\nexec firejail --profile=\"/usr/lib/alr/firejailed/_usr_bin_test.profile\" \"/usr/lib/alr/firejailed/_usr_bin_test\" \"$@\"\n",
-		},
-		{
-			"path with spaces",
-			"/usr/lib/alr/firejailed/_usr_bin_my_app",
-			"/usr/lib/alr/firejailed/_usr_bin_my_app.profile",
-			"#!/bin/bash\nexec firejail --profile=\"/usr/lib/alr/firejailed/_usr_bin_my_app.profile\" \"/usr/lib/alr/firejailed/_usr_bin_my_app\" \"$@\"\n",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			tmpDir := t.TempDir()
-			scriptPath := filepath.Join(tmpDir, "wrapper.sh")
-
-			err := createWrapperScript(scriptPath, tt.origFilePath, tt.profilePath)
-
-			assert.NoError(t, err)
-			assert.FileExists(t, scriptPath)
-
-			content, err := os.ReadFile(scriptPath)
-			assert.NoError(t, err)
-			assert.Equal(t, tt.expectedContent, string(content))
-
-			// Check file permissions
-			info, err := os.Stat(scriptPath)
-			assert.NoError(t, err)
-			assert.Equal(t, os.FileMode(defaultDirMode), info.Mode())
-		})
-	}
-}
-
-func TestCreateFirejailedBinary(t *testing.T) {
-	tests := []struct {
-		name        string
-		setupFunc   func(string) (*alrsh.Package, *files.Content, types.Directories)
-		expectError bool
-		errorMsg    string
-	}{
-		{
-			"successful creation with default profile",
-			func(tmpDir string) (*alrsh.Package, *files.Content, types.Directories) {
-				pkgDir := filepath.Join(tmpDir, "pkg")
-				scriptDir := filepath.Join(tmpDir, "scripts")
-				os.MkdirAll(pkgDir, 0o755)
-				os.MkdirAll(scriptDir, 0o755)
-
-				srcBinary := filepath.Join(tmpDir, "test-binary")
-				os.WriteFile(srcBinary, []byte("#!/bin/bash\necho test"), 0o755)
-
-				defaultProfile := filepath.Join(scriptDir, "default.profile")
-				os.WriteFile(defaultProfile, []byte("include /etc/firejail/default.profile\nnet none"), 0o644)
-
-				pkg := &alrsh.Package{
-					Name: "test-pkg",
-					FireJailProfiles: alrsh.OverridableFromMap(map[string]map[string]string{
-						"": {"default": "default.profile"},
-					}),
-				}
-				alrsh.ResolvePackage(pkg, []string{""})
-
-				content := &files.Content{
-					Source:      srcBinary,
-					Destination: "./usr/bin/test-binary",
-					Type:        "file",
-				}
-
-				dirs := types.Directories{PkgDir: pkgDir, ScriptDir: scriptDir}
-				return pkg, content, dirs
-			},
-			false,
-			"",
-		},
-		{
-			"successful creation with specific profile",
-			func(tmpDir string) (*alrsh.Package, *files.Content, types.Directories) {
-				pkgDir := filepath.Join(tmpDir, "pkg")
-				scriptDir := filepath.Join(tmpDir, "scripts")
-				os.MkdirAll(pkgDir, 0o755)
-				os.MkdirAll(scriptDir, 0o755)
-
-				srcBinary := filepath.Join(tmpDir, "special-binary")
-				os.WriteFile(srcBinary, []byte("#!/bin/bash\necho special"), 0o755)
-
-				defaultProfile := filepath.Join(scriptDir, "default.profile")
-				os.WriteFile(defaultProfile, []byte("include /etc/firejail/default.profile"), 0o644)
-
-				specialProfile := filepath.Join(scriptDir, "special.profile")
-				os.WriteFile(specialProfile, []byte("include /etc/firejail/default.profile\nnet none\nprivate-tmp"), 0o644)
-
-				pkg := &alrsh.Package{
-					Name: "test-pkg",
-					FireJailProfiles: alrsh.OverridableFromMap(map[string]map[string]string{
-						"": {"default": "default.profile", "/usr/bin/special-binary": "special.profile"},
-					}),
-				}
-				alrsh.ResolvePackage(pkg, []string{""})
-
-				content := &files.Content{
-					Source:      srcBinary,
-					Destination: "./usr/bin/special-binary",
-					Type:        "file",
-				}
-
-				dirs := types.Directories{PkgDir: pkgDir, ScriptDir: scriptDir}
-				return pkg, content, dirs
-			},
-			false,
-			"",
-		},
-		{
-			"missing default profile",
-			func(tmpDir string) (*alrsh.Package, *files.Content, types.Directories) {
-				pkgDir := filepath.Join(tmpDir, "pkg")
-				scriptDir := filepath.Join(tmpDir, "scripts")
-				os.MkdirAll(pkgDir, 0o755)
-				os.MkdirAll(scriptDir, 0o755)
-
-				srcBinary := filepath.Join(tmpDir, "test-binary")
-				os.WriteFile(srcBinary, []byte("#!/bin/bash\necho test"), 0o755)
-
-				pkg := &alrsh.Package{
-					Name:             "test-pkg",
-					FireJailProfiles: alrsh.OverridableFromMap(map[string]map[string]string{"": {}}),
-				}
-				alrsh.ResolvePackage(pkg, []string{""})
-
-				content := &files.Content{Source: srcBinary, Destination: "./usr/bin/test-binary", Type: "file"}
-				dirs := types.Directories{PkgDir: pkgDir, ScriptDir: scriptDir}
-				return pkg, content, dirs
-			},
-			true,
-			"default profile is missing",
-		},
-		{
-			"profile file not found",
-			func(tmpDir string) (*alrsh.Package, *files.Content, types.Directories) {
-				pkgDir := filepath.Join(tmpDir, "pkg")
-				scriptDir := filepath.Join(tmpDir, "scripts")
-				os.MkdirAll(pkgDir, 0o755)
-				os.MkdirAll(scriptDir, 0o755)
-
-				srcBinary := filepath.Join(tmpDir, "test-binary")
-				os.WriteFile(srcBinary, []byte("#!/bin/bash\necho test"), 0o755)
-
-				pkg := &alrsh.Package{
-					Name:             "test-pkg",
-					FireJailProfiles: alrsh.OverridableFromMap(map[string]map[string]string{"": {"default": "nonexistent.profile"}}),
-				}
-				alrsh.ResolvePackage(pkg, []string{""})
-
-				content := &files.Content{Source: srcBinary, Destination: "./usr/bin/test-binary", Type: "file"}
-				dirs := types.Directories{PkgDir: pkgDir, ScriptDir: scriptDir}
-				return pkg, content, dirs
-			},
-			true,
-			"",
-		},
-		{
-			"invalid destination path",
-			func(tmpDir string) (*alrsh.Package, *files.Content, types.Directories) {
-				pkgDir := filepath.Join(tmpDir, "pkg")
-				scriptDir := filepath.Join(tmpDir, "scripts")
-				os.MkdirAll(pkgDir, 0o755)
-				os.MkdirAll(scriptDir, 0o755)
-
-				srcBinary := filepath.Join(tmpDir, "test-binary")
-				os.WriteFile(srcBinary, []byte("#!/bin/bash\necho test"), 0o755)
-
-				defaultProfile := filepath.Join(scriptDir, "default.profile")
-				os.WriteFile(defaultProfile, []byte("include /etc/firejail/default.profile"), 0o644)
-
-				pkg := &alrsh.Package{Name: "test-pkg", FireJailProfiles: alrsh.OverridableFromMap(map[string]map[string]string{"": {"default": "default.profile"}})}
-				alrsh.ResolvePackage(pkg, []string{""})
-
-				content := &files.Content{Source: srcBinary, Destination: ".", Type: "file"}
-				dirs := types.Directories{PkgDir: pkgDir, ScriptDir: scriptDir}
-				return pkg, content, dirs
-			},
-			true,
-			"",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			tmpDir := t.TempDir()
-			pkg, content, dirs := tt.setupFunc(tmpDir)
-
-			err := createFirejailedDirectory(dirs.PkgDir)
-			assert.NoError(t, err)
-
-			result, err := createFirejailedBinary(pkg, content, dirs)
-
-			if tt.expectError {
-				assert.Error(t, err)
-				if tt.errorMsg != "" {
-					assert.Contains(t, err.Error(), tt.errorMsg)
-				}
-				assert.Nil(t, result)
-			} else {
-				assert.NoError(t, err)
-				assert.Len(t, result, 2)
-
-				binContent := result[0]
-				assert.Contains(t, binContent.Destination, "usr/lib/alr/firejailed/")
-				assert.FileExists(t, binContent.Source)
-
-				profileContent := result[1]
-				assert.Contains(t, profileContent.Destination, "usr/lib/alr/firejailed/")
-				assert.Contains(t, profileContent.Destination, ".profile")
-				assert.FileExists(t, profileContent.Source)
-
-				assert.FileExists(t, content.Source)
-				wrapperBytes, err := os.ReadFile(content.Source)
-				assert.NoError(t, err)
-				wrapper := string(wrapperBytes)
-				assert.Contains(t, wrapper, "#!/bin/bash")
-				assert.Contains(t, wrapper, "firejail --profile=")
-			}
-		})
-	}
-}

internal/cliutils/app_builder/builder.go

@@ -26,9 +26,9 @@ import (
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/manager"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/repos"
 	"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"
 )
 
 type AppDeps struct {
@@ -123,15 +123,8 @@ func (b *AppBuilder) withRepos(enablePull, forcePull bool) *AppBuilder {
 
 	cfg := b.deps.Cfg
 	db := b.deps.DB
-	info := b.deps.Info
+	if cfg == nil || db == nil {
-
+		b.err = errors.New("config and db are required before initializing repos")
-	if info == nil {
-		b.WithDistroInfo()
-		info = b.deps.Info
-	}
-
-	if cfg == nil || db == nil || info == nil {
-		b.err = errors.New("config, db and info are required before initializing repos")
 		return b
 	}
 

internal/cliutils/prompt.go

@@ -28,8 +28,8 @@ import (
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/leonelquinteros/gotext"
 
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/pager"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
 )
 
 // YesNoPrompt asks the user a yes or no question, using def as the default answer
@@ -102,8 +102,8 @@ func ShowScript(path, name, style string) error {
 
 // FlattenPkgs attempts to flatten the a map of slices of packages into a single slice
 // of packages by prompting the user if multiple packages match.
-func FlattenPkgs(ctx context.Context, found map[string][]alrsh.Package, verb string, interactive bool) []alrsh.Package {
+func FlattenPkgs(ctx context.Context, found map[string][]db.Package, verb string, interactive bool) []db.Package {
-	var outPkgs []alrsh.Package
+	var outPkgs []db.Package
 	for _, pkgs := range found {
 		if len(pkgs) > 1 && interactive {
 			choice, err := PkgPrompt(ctx, pkgs, verb, interactive)
@@ -120,7 +120,7 @@ func FlattenPkgs(ctx context.Context, found map[string][]alrsh.Package, verb str
 }
 
 // PkgPrompt asks the user to choose between multiple packages.
-func PkgPrompt(ctx context.Context, options []alrsh.Package, verb string, interactive bool) (alrsh.Package, error) {
+func PkgPrompt(ctx context.Context, options []db.Package, verb string, interactive bool) (db.Package, error) {
 	if !interactive {
 		return options[0], nil
 	}
@@ -138,7 +138,7 @@ func PkgPrompt(ctx context.Context, options []alrsh.Package, verb string, intera
 	var choice int
 	err := survey.AskOne(prompt, &choice)
 	if err != nil {
-		return alrsh.Package{}, err
+		return db.Package{}, err
 	}
 
 	return options[choice], nil

internal/config/config.go

@@ -29,7 +29,7 @@ import (
 	"github.com/pelletier/go-toml/v2"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/constants"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 )
 
 type ALRConfig struct {

internal/db/db.go

@@ -23,18 +23,41 @@ import (
 	"context"
 	"log/slog"
 
+	"github.com/jmoiron/sqlx"
 	"github.com/leonelquinteros/gotext"
-	_ "modernc.org/sqlite"
-	"xorm.io/xorm"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
 )
 
-const CurrentVersion = 5
+// CurrentVersion is the current version of the database.
+// The database is reset if its version doesn't match this.
+const CurrentVersion = 4
 
-type Version struct {
+// Package is a ALR package's database representation
-	Version int `xorm:"'version'"`
+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"`
+	Epoch         uint                      `sh:"epoch" db:"epoch"`
+	Summary       JSON[map[string]string]   `db:"summary"`
+	Description   JSON[map[string]string]   `db:"description"`
+	Group         JSON[map[string]string]   `db:"group_name"`
+	Homepage      JSON[map[string]string]   `db:"homepage"`
+	Maintainer    JSON[map[string]string]   `db:"maintainer"`
+	Architectures JSON[[]string]            `sh:"architectures" db:"architectures"`
+	Licenses      JSON[[]string]            `sh:"license" db:"licenses"`
+	Provides      JSON[[]string]            `sh:"provides" db:"provides"`
+	Conflicts     JSON[[]string]            `sh:"conflicts" db:"conflicts"`
+	Replaces      JSON[[]string]            `sh:"replaces" db:"replaces"`
+	Depends       JSON[map[string][]string] `db:"depends"`
+	BuildDepends  JSON[map[string][]string] `db:"builddepends"`
+	OptDepends    JSON[map[string][]string] `db:"optdepends"`
+	Repository    string                    `db:"repository"`
+}
+
+type version struct {
+	Version int `db:"version"`
 }
 
 type Config interface {
@@ -42,7 +65,7 @@ type Config interface {
 }
 
 type Database struct {
-	engine *xorm.Engine
+	conn   *sqlx.DB
 	config Config
 }
 
@@ -52,100 +75,181 @@ func New(config Config) *Database {
 	}
 }
 
-func (d *Database) Connect() error {
+func (d *Database) Init(ctx context.Context) error {
-	dsn := d.config.GetPaths().DBPath
+	err := d.Connect(ctx)
-	engine, err := xorm.NewEngine("sqlite", dsn)
-	// engine.SetLogLevel(log.LOG_DEBUG)
-	// engine.ShowSQL(true)
 	if err != nil {
 		return err
 	}
-	d.engine = engine
+	return d.initDB(ctx)
+}
+
+func (d *Database) Connect(ctx context.Context) error {
+	dsn := d.config.GetPaths().DBPath
+	db, err := sqlx.Open("sqlite", dsn)
+	if err != nil {
+		return err
+	}
+	d.conn = db
 	return nil
 }
 
-func (d *Database) Init(ctx context.Context) error {
+func (d *Database) GetConn() *sqlx.DB {
-	if err := d.Connect(); err != nil {
+	return d.conn
-		return err
+}
-	}
+
-	if err := d.engine.Sync2(new(alrsh.Package), new(Version)); err != nil {
+func (d *Database) initDB(ctx context.Context) error {
+	d.conn = d.conn.Unsafe()
+	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,
+			release       INT  NOT NULL,
+			epoch         INT,
+			summary       TEXT CHECK(summary = 'null' OR (JSON_VALID(summary) AND JSON_TYPE(summary) = 'object')),
+			description   TEXT CHECK(description = 'null' OR (JSON_VALID(description) AND JSON_TYPE(description) = 'object')),
+			group_name    TEXT CHECK(group_name = 'null' OR (JSON_VALID(group_name) AND JSON_TYPE(group_name) = 'object')),
+			homepage      TEXT CHECK(homepage = 'null' OR (JSON_VALID(homepage) AND JSON_TYPE(homepage) = 'object')),
+			maintainer    TEXT CHECK(maintainer = 'null' OR (JSON_VALID(maintainer) AND JSON_TYPE(maintainer) = 'object')),
+			architectures TEXT CHECK(architectures = 'null' OR (JSON_VALID(architectures) AND JSON_TYPE(architectures) = 'array')),
+			licenses      TEXT CHECK(licenses = 'null' OR (JSON_VALID(licenses) AND JSON_TYPE(licenses) = 'array')),
+			provides      TEXT CHECK(provides = 'null' OR (JSON_VALID(provides) AND JSON_TYPE(provides) = 'array')),
+			conflicts     TEXT CHECK(conflicts = 'null' OR (JSON_VALID(conflicts) AND JSON_TYPE(conflicts) = 'array')),
+			replaces      TEXT CHECK(replaces = 'null' OR (JSON_VALID(replaces) AND JSON_TYPE(replaces) = 'array')),
+			depends       TEXT CHECK(depends = 'null' OR (JSON_VALID(depends) AND JSON_TYPE(depends) = 'object')),
+			builddepends  TEXT CHECK(builddepends = 'null' OR (JSON_VALID(builddepends) AND JSON_TYPE(builddepends) = 'object')),
+			optdepends    TEXT CHECK(optdepends = 'null' OR (JSON_VALID(optdepends) AND JSON_TYPE(optdepends) = 'object')),
+			UNIQUE(name, repository)
+		);
+
+		CREATE TABLE IF NOT EXISTS alr_db_version (
+			version INT NOT NULL
+		);
+	`)
+	if err != nil {
 		return err
 	}
+
 	ver, ok := d.GetVersion(ctx)
 	if ok && ver != CurrentVersion {
 		slog.Warn(gotext.Get("Database version mismatch; resetting"), "version", ver, "expected", CurrentVersion)
-		if err := d.reset(); err != nil {
+		err = d.reset(ctx)
+		if err != nil {
 			return err
 		}
-		return d.Init(ctx)
+		return d.initDB(ctx)
 	} else if !ok {
-		slog.Warn(gotext.Get("Database version does not exist. Run alr fix if something isn't working."))
+		slog.Warn(gotext.Get("Database version does not exist. Run alr fix if something isn't working."), "version", ver, "expected", CurrentVersion)
-		return d.addVersion(CurrentVersion)
+		return d.addVersion(ctx, CurrentVersion)
 	}
+
 	return nil
 }
 
 func (d *Database) GetVersion(ctx context.Context) (int, bool) {
-	var v Version
+	var ver version
-	has, err := d.engine.Get(&v)
+	err := d.conn.GetContext(ctx, &ver, "SELECT * FROM alr_db_version LIMIT 1;")
-	if err != nil || !has {
+	if err != nil {
 		return 0, false
 	}
-	return v.Version, true
+	return ver.Version, true
 }
 
-func (d *Database) addVersion(ver int) error {
+func (d *Database) addVersion(ctx context.Context, ver int) error {
-	_, err := d.engine.Insert(&Version{Version: ver})
+	_, err := d.conn.ExecContext(ctx, `INSERT INTO alr_db_version(version) VALUES (?);`, ver)
 	return err
 }
 
-func (d *Database) reset() error {
+func (d *Database) reset(ctx context.Context) error {
-	return d.engine.DropTables(new(alrsh.Package), new(Version))
+	_, err := d.conn.ExecContext(ctx, "DROP TABLE IF EXISTS pkgs;")
-}
-
-func (d *Database) InsertPackage(ctx context.Context, pkg alrsh.Package) error {
-	session := d.engine.Context(ctx)
-
-	affected, err := session.Where("name = ? AND repository = ?", pkg.Name, pkg.Repository).Update(&pkg)
 	if err != nil {
 		return err
 	}
-
+	_, err = d.conn.ExecContext(ctx, "DROP TABLE IF EXISTS alr_db_version;")
-	if affected == 0 {
-		_, err = session.Insert(&pkg)
-		if err != nil {
 	return err
 }
-	}
 
-	return nil
+func (d *Database) GetPkgs(ctx context.Context, where string, args ...any) (*sqlx.Rows, error) {
-}
+	stream, err := d.conn.QueryxContext(ctx, "SELECT * FROM pkgs WHERE "+where, args...)
-
+	if err != nil {
-func (d *Database) GetPkgs(_ context.Context, where string, args ...any) ([]alrsh.Package, error) {
-	var pkgs []alrsh.Package
-	err := d.engine.Where(where, args...).Find(&pkgs)
-	return pkgs, err
-}
-
-func (d *Database) GetPkg(where string, args ...any) (*alrsh.Package, error) {
-	var pkg alrsh.Package
-	has, err := d.engine.Where(where, args...).Get(&pkg)
-	if err != nil || !has {
 		return nil, err
 	}
-	return &pkg, nil
+	return stream, nil
 }
 
-func (d *Database) DeletePkgs(_ context.Context, where string, args ...any) error {
+func (d *Database) GetPkg(ctx context.Context, where string, args ...any) (*Package, error) {
-	_, err := d.engine.Where(where, args...).Delete(&alrsh.Package{})
+	out := &Package{}
+	err := d.conn.GetContext(ctx, out, "SELECT * FROM pkgs WHERE "+where+" LIMIT 1", args...)
+	return out, err
+}
+
+func (d *Database) DeletePkgs(ctx context.Context, where string, args ...any) error {
+	_, err := d.conn.ExecContext(ctx, "DELETE FROM pkgs WHERE "+where, args...)
 	return err
 }
 
-func (d *Database) IsEmpty() bool {
+func (d *Database) IsEmpty(ctx context.Context) bool {
-	count, err := d.engine.Count(new(alrsh.Package))
+	var count int
-	return err != nil || count == 0
+	err := d.conn.GetContext(ctx, &count, "SELECT count(1) FROM pkgs;")
+	if err != nil {
+		return true
+	}
+	return count == 0
+}
+
+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,
+			release,
+			epoch,
+			summary,
+			description,
+			group_name,
+			homepage,
+			maintainer,
+			architectures,
+			licenses,
+			provides,
+			conflicts,
+			replaces,
+			depends,
+			builddepends,
+			optdepends
+		) VALUES (
+		 	:basepkg_name,
+			:name,
+			:repository,
+			:version,
+			:release,
+			:epoch,
+			:summary,
+			:description,
+			:group_name,
+			:homepage,
+			:maintainer,
+			:architectures,
+			:licenses,
+			:provides,
+			:conflicts,
+			:replaces,
+			:depends,
+			:builddepends,
+			:optdepends
+		);
+	`, pkg)
+	return err
 }
 
 func (d *Database) Close() error {
-	return d.engine.Close()
+	if d.conn != nil {
+		return d.conn.Close()
+	} else {
+		return nil
+	}
 }

internal/db/db_test.go

@@ -25,11 +25,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
+	"github.com/jmoiron/sqlx"
 
 	"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/pkg/alrsh"
 )
 
 type TestALRConfig struct{}
@@ -46,38 +45,35 @@ func prepareDb() *db.Database {
 	return database
 }
 
-var testPkg = alrsh.Package{
+var testPkg = db.Package{
 	Name:    "test",
 	Version: "0.0.1",
 	Release: 1,
 	Epoch:   2,
-	Description: alrsh.OverridableFromMap(map[string]string{
+	Description: db.NewJSON(map[string]string{
 		"en": "Test package",
 		"ru": "Проверочный пакет",
 	}),
-	Homepage: alrsh.OverridableFromMap(map[string]string{
+	Homepage: db.NewJSON(map[string]string{
 		"en": "https://gitea.plemya-x.ru/xpamych/ALR",
 	}),
-	Maintainer: alrsh.OverridableFromMap(map[string]string{
+	Maintainer: db.NewJSON(map[string]string{
 		"en": "Evgeniy Khramov <xpamych@yandex.ru>",
 		"ru": "Евгений Храмов <xpamych@yandex.ru>",
 	}),
-	Architectures: []string{"arm64", "amd64"},
+	Architectures: db.NewJSON([]string{"arm64", "amd64"}),
-	Licenses:      []string{"GPL-3.0-or-later"},
+	Licenses:      db.NewJSON([]string{"GPL-3.0-or-later"}),
-	Provides:      []string{"test"},
+	Provides:      db.NewJSON([]string{"test"}),
-	Conflicts:     []string{"test"},
+	Conflicts:     db.NewJSON([]string{"test"}),
-	Replaces:      []string{"test-old"},
+	Replaces:      db.NewJSON([]string{"test-old"}),
-	Depends: alrsh.OverridableFromMap(map[string][]string{
+	Depends: db.NewJSON(map[string][]string{
 		"": {"sudo"},
 	}),
-	BuildDepends: alrsh.OverridableFromMap(map[string][]string{
+	BuildDepends: db.NewJSON(map[string][]string{
 		"":     {"golang"},
 		"arch": {"go"},
 	}),
 	Repository: "default",
-	Summary:    alrsh.OverridableFromMap(map[string]string{}),
-	Group:      alrsh.OverridableFromMap(map[string]string{}),
-	OptDepends: alrsh.OverridableFromMap(map[string][]string{}),
 }
 
 func TestInit(t *testing.T) {
@@ -103,16 +99,15 @@ func TestInsertPackage(t *testing.T) {
 		t.Fatalf("Expected no error, got %s", err)
 	}
 
-	pkgs, err := database.GetPkgs(ctx, "name = 'test' AND repository = 'default'")
+	dbPkg := db.Package{}
+	err = sqlx.Get(database.GetConn(), &dbPkg, "SELECT * FROM pkgs WHERE name = 'test' AND repository = 'default'")
 	if err != nil {
 		t.Fatalf("Expected no error, got %s", err)
 	}
 
-	if len(pkgs) != 1 {
+	if !reflect.DeepEqual(testPkg, dbPkg) {
-		t.Fatalf("Expected 1 package, got %d", len(pkgs))
+		t.Errorf("Expected test package to be the same as database package")
 	}
-
-	assert.Equal(t, testPkg, pkgs[0])
 }
 
 func TestGetPkgs(t *testing.T) {
@@ -135,12 +130,18 @@ func TestGetPkgs(t *testing.T) {
 		t.Errorf("Expected no error, got %s", err)
 	}
 
-	pkgs, err := database.GetPkgs(ctx, "name LIKE 'x%'")
+	result, err := database.GetPkgs(ctx, "name LIKE 'x%'")
 	if err != nil {
 		t.Fatalf("Expected no error, got %s", err)
 	}
 
-	for _, dbPkg := range pkgs {
+	for result.Next() {
+		var dbPkg db.Package
+		err = result.StructScan(&dbPkg)
+		if err != nil {
+			t.Errorf("Expected no error, got %s", err)
+		}
+
 		if !strings.HasPrefix(dbPkg.Name, "x") {
 			t.Errorf("Expected package name to start with 'x', got %s", dbPkg.Name)
 		}
@@ -167,7 +168,7 @@ func TestGetPkg(t *testing.T) {
 		t.Errorf("Expected no error, got %s", err)
 	}
 
-	pkg, err := database.GetPkg("name LIKE 'x%'")
+	pkg, err := database.GetPkg(ctx, "name LIKE 'x%' ORDER BY name")
 	if err != nil {
 		t.Fatalf("Expected no error, got %s", err)
 	}
@@ -205,6 +206,16 @@ func TestDeletePkgs(t *testing.T) {
 	if err != nil {
 		t.Errorf("Expected no error, got %s", err)
 	}
+
+	var dbPkg db.Package
+	err = database.GetConn().Get(&dbPkg, "SELECT * FROM pkgs WHERE name LIKE 'x%' ORDER BY name LIMIT 1;")
+	if err != nil {
+		t.Errorf("Expected no error, got %s", err)
+	}
+
+	if dbPkg.Name != "x2" {
+		t.Errorf("Expected x2 package, got %s", dbPkg.Name)
+	}
 }
 
 func TestJsonArrayContains(t *testing.T) {
@@ -216,7 +227,7 @@ func TestJsonArrayContains(t *testing.T) {
 	x1.Name = "x1"
 	x2 := testPkg
 	x2.Name = "x2"
-	x2.Provides = append(x2.Provides, "x")
+	x2.Provides.Val = append(x2.Provides.Val, "x")
 
 	err := database.InsertPackage(ctx, x1)
 	if err != nil {
@@ -228,24 +239,13 @@ func TestJsonArrayContains(t *testing.T) {
 		t.Errorf("Expected no error, got %s", err)
 	}
 
-	pkgs, err := database.GetPkgs(ctx, "name = 'x2'")
+	var dbPkg db.Package
+	err = database.GetConn().Get(&dbPkg, "SELECT * FROM pkgs WHERE json_array_contains(provides, 'x');")
 	if err != nil {
 		t.Fatalf("Expected no error, got %s", err)
 	}
 
-	if len(pkgs) != 1 || pkgs[0].Name != "x2" {
+	if dbPkg.Name != "x2" {
-		t.Errorf("Expected x2 package, got %v", pkgs)
+		t.Errorf("Expected x2 package, got %s", dbPkg.Name)
-	}
-
-	// Verify the provides field contains 'x'
-	found := false
-	for _, p := range pkgs[0].Provides {
-		if p == "x" {
-			found = true
-			break
-		}
-	}
-	if !found {
-		t.Errorf("Expected provides to contain 'x'")
 	}
 }

internal/db/json.go

@@ -0,0 +1,80 @@
+// ALR - Any Linux Repository
+// Copyright (C) 2025 The ALR Authors
+//
+// 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 (
+	"database/sql"
+	"database/sql/driver"
+	"encoding/json"
+	"errors"
+	"fmt"
+)
+
+// JSON represents a JSON value in the database
+type JSON[T any] struct {
+	Val T
+}
+
+// NewJSON creates a new database JSON value
+func NewJSON[T any](v T) JSON[T] {
+	return JSON[T]{Val: v}
+}
+
+func (s *JSON[T]) Scan(val any) error {
+	if val == nil {
+		return nil
+	}
+
+	switch val := val.(type) {
+	case string:
+		err := json.Unmarshal([]byte(val), &s.Val)
+		if err != nil {
+			return err
+		}
+	case sql.NullString:
+		if val.Valid {
+			err := json.Unmarshal([]byte(val.String), &s.Val)
+			if err != nil {
+				return err
+			}
+		}
+	default:
+		return errors.New("sqlite json types must be strings")
+	}
+
+	return nil
+}
+
+func (s JSON[T]) Value() (driver.Value, error) {
+	data, err := json.Marshal(s.Val)
+	if err != nil {
+		return nil, err
+	}
+	return string(data), nil
+}
+
+func (s JSON[T]) MarshalYAML() (any, error) {
+	return s.Val, nil
+}
+
+func (s JSON[T]) String() string {
+	return fmt.Sprint(s.Val)
+}
+
+func (s JSON[T]) GoString() string {
+	return fmt.Sprintf("%#v", s.Val)
+}

internal/overrides/overrides.go

@@ -21,6 +21,7 @@ package overrides
 
 import (
 	"fmt"
+	"reflect"
 	"regexp"
 	"strings"
 
@@ -28,6 +29,7 @@ import (
 	"golang.org/x/text/language"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 )
 
@@ -148,6 +150,65 @@ func (o *Opts) WithLanguageTags(langs []string) *Opts {
 	return out
 }
 
+// ResolvedPackage is a ALR package after its overrides
+// have been resolved
+type ResolvedPackage struct {
+	Name          string   `sh:"name"`
+	Version       string   `sh:"version"`
+	Release       int      `sh:"release"`
+	Epoch         uint     `sh:"epoch"`
+	Group         string   `db:"group_name"`
+	Summary       string   `db:"summary"`
+	Description   string   `db:"description"`
+	Homepage      string   `db:"homepage"`
+	Maintainer    string   `db:"maintainer"`
+	Architectures []string `sh:"architectures"`
+	Licenses      []string `sh:"license"`
+	Provides      []string `sh:"provides"`
+	Conflicts     []string `sh:"conflicts"`
+	Replaces      []string `sh:"replaces"`
+	Depends       []string `sh:"deps"`
+	BuildDepends  []string `sh:"build_deps"`
+	OptDepends    []string `sh:"opt_deps"`
+}
+
+func ResolvePackage(pkg *db.Package, overrides []string) *ResolvedPackage {
+	out := &ResolvedPackage{}
+	outVal := reflect.ValueOf(out).Elem()
+	pkgVal := reflect.ValueOf(pkg).Elem()
+
+	for i := 0; i < outVal.NumField(); i++ {
+		fieldVal := outVal.Field(i)
+		fieldType := fieldVal.Type()
+		pkgFieldVal := pkgVal.FieldByName(outVal.Type().Field(i).Name)
+		pkgFieldType := pkgFieldVal.Type()
+
+		if strings.HasPrefix(pkgFieldType.String(), "db.JSON") {
+			pkgFieldVal = pkgFieldVal.FieldByName("Val")
+			pkgFieldType = pkgFieldVal.Type()
+		}
+
+		if pkgFieldType.AssignableTo(fieldType) {
+			fieldVal.Set(pkgFieldVal)
+			continue
+		}
+
+		if pkgFieldVal.Kind() == reflect.Map && pkgFieldType.Elem().AssignableTo(fieldType) {
+			for _, override := range overrides {
+				overrideVal := pkgFieldVal.MapIndex(reflect.ValueOf(override))
+				if !overrideVal.IsValid() {
+					continue
+				}
+
+				fieldVal.Set(overrideVal)
+				break
+			}
+		}
+	}
+
+	return out
+}
+
 func parseLangs(langs []string, tags []language.Tag) ([]string, error) {
 	out := make([]string, len(tags)+len(langs))
 	for i, tag := range tags {

internal/repos/utils.go

@@ -1,112 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 The ALR Authors
-//
-// 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"
-	"fmt"
-	"io"
-
-	"github.com/go-git/go-git/v5"
-	"github.com/go-git/go-git/v5/plumbing"
-	"github.com/go-git/go-git/v5/plumbing/transport"
-	"github.com/go-git/go-git/v5/plumbing/transport/client"
-
-	"mvdan.cc/sh/v3/interp"
-	"mvdan.cc/sh/v3/syntax"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
-)
-
-func parseScript(
-	ctx context.Context,
-	repo types.Repo,
-	syntaxParser *syntax.Parser,
-	runner *interp.Runner,
-	r io.ReadCloser,
-) ([]*alrsh.Package, error) {
-	f, err := alrsh.ReadFromIOReader(r, "/tmp")
-	if err != nil {
-		return nil, err
-	}
-	_, dbPkgs, err := f.ParseBuildVars(ctx, &distro.OSRelease{}, []string{})
-	if err != nil {
-		return nil, err
-	}
-	for _, pkg := range dbPkgs {
-		pkg.Repository = repo.Name
-	}
-	return dbPkgs, nil
-}
-
-func getHeadReference(r *git.Repository) (plumbing.ReferenceName, error) {
-	remote, err := r.Remote(git.DefaultRemoteName)
-	if err != nil {
-		return "", err
-	}
-
-	endpoint, err := transport.NewEndpoint(remote.Config().URLs[0])
-	if err != nil {
-		return "", err
-	}
-
-	gitClient, err := client.NewClient(endpoint)
-	if err != nil {
-		return "", err
-	}
-
-	session, err := gitClient.NewUploadPackSession(endpoint, nil)
-	if err != nil {
-		return "", err
-	}
-
-	info, err := session.AdvertisedReferences()
-	if err != nil {
-		return "", err
-	}
-
-	refs, err := info.AllReferences()
-	if err != nil {
-		return "", err
-	}
-
-	return refs["HEAD"].Target(), nil
-}
-
-func resolveHash(r *git.Repository, ref string) (*plumbing.Hash, error) {
-	var err error
-
-	if ref == "" {
-		reference, err := getHeadReference(r)
-		if err != nil {
-			return nil, fmt.Errorf("failed to get head reference %w", err)
-		}
-		ref = reference.Short()
-	}
-
-	hsh, err := r.ResolveRevision(git.DefaultRemoteName + "/" + plumbing.Revision(ref))
-	if err != nil {
-		hsh, err = r.ResolveRevision(plumbing.Revision(ref))
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return hsh, nil
-}

internal/shutils/decoder/decoder.go

@@ -22,8 +22,6 @@ package decoder
 import (
 	"context"
 	"errors"
-	"fmt"
-	"log/slog"
 	"reflect"
 	"strings"
 
@@ -54,7 +52,7 @@ type InvalidTypeError struct {
 }
 
 func (ite InvalidTypeError) Error() string {
-	return fmt.Sprintf("variable '%s' is of type %s, but %s is expected", ite.name, ite.vartype, ite.exptype)
+	return "variable '" + ite.name + "' is of type " + ite.vartype + ", but " + ite.exptype + " is expected"
 }
 
 // Decoder provides methods for decoding variable values
@@ -83,48 +81,13 @@ func (d *Decoder) DecodeVar(name string, val any) error {
 	dec, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
 		WeaklyTypedInput: true,
 		DecodeHook: mapstructure.DecodeHookFuncValue(func(from, to reflect.Value) (interface{}, error) {
-			if strings.Contains(to.Type().String(), "alrsh.OverridableField") {
+			if strings.Contains(to.Type().String(), "db.JSON") {
-				if to.Kind() != reflect.Ptr && to.CanAddr() {
+				valType := to.FieldByName("Val").Type()
-					to = to.Addr()
+				if !from.Type().AssignableTo(valType) {
-				}
+					return nil, InvalidTypeError{name, from.Type().String(), valType.String()}
-
-				names, err := overrides.Resolve(d.info, overrides.DefaultOpts.WithName(name))
-				if err != nil {
-					return nil, err
-				}
-
-				isNotSet := true
-
-				setMethod := to.MethodByName("Set")
-				setResolvedMethod := to.MethodByName("SetResolved")
-
-				for _, varName := range names {
-					val := d.getVarNoOverrides(varName)
-					if val == nil {
-						continue
-					}
-
-					t := setMethod.Type().In(1)
-
-					newVal := from
-
-					if !newVal.Type().AssignableTo(t) {
-						newVal = reflect.New(t)
-						err = d.DecodeVar(name, newVal.Interface())
-						if err != nil {
-							return nil, err
-						}
-						newVal = newVal.Elem()
-					}
-
-					if isNotSet {
-						setResolvedMethod.Call([]reflect.Value{newVal})
-					}
-
-					override := strings.TrimPrefix(strings.TrimPrefix(varName, name), "_")
-					setMethod.Call([]reflect.Value{reflect.ValueOf(override), newVal})
 				}
 
+				to.FieldByName("Val").Set(from)
 				return to, nil
 			}
 			return from.Interface(), nil
@@ -133,7 +96,6 @@ func (d *Decoder) DecodeVar(name string, val any) error {
 		TagName: "sh",
 	})
 	if err != nil {
-		slog.Warn("err", "err", err)
 		return err
 	}
 
@@ -293,16 +255,7 @@ func (d *Decoder) getVar(name string) *expand.Variable {
 	}
 
 	for _, varName := range names {
-		res := d.getVarNoOverrides(varName)
+		val, ok := d.Runner.Vars[varName]
-		if res != nil {
-			return res
-		}
-	}
-	return nil
-}
-
-func (d *Decoder) getVarNoOverrides(name string) *expand.Variable {
-	val, ok := d.Runner.Vars[name]
 		if ok {
 			// Resolve nameref variables
 			_, resolved := val.Resolve(expand.FuncEnviron(func(s string) string {
@@ -315,6 +268,7 @@ func (d *Decoder) getVarNoOverrides(name string) *expand.Variable {
 
 			return &val
 		}
+	}
 	return nil
 }
 

internal/translations/default.pot

@@ -58,11 +58,11 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
-#: fix.go:39
+#: fix.go:38
 msgid "Attempt to fix problems with ALR"
 msgstr ""
 
-#: fix.go:60
+#: fix.go:59
 msgid "Clearing cache directory"
 msgstr ""
 
@@ -74,15 +74,15 @@ msgstr ""
 msgid "Unable to read cache directory contents"
 msgstr ""
 
-#: fix.go:82
+#: fix.go:76
 msgid "Unable to remove cache item (%s)"
 msgstr ""
 
-#: fix.go:86
+#: fix.go:80
 msgid "Rebuilding cache"
 msgstr ""
 
-#: fix.go:90
+#: fix.go:84
 msgid "Unable to create new cache directory"
 msgstr ""
 
@@ -126,120 +126,58 @@ msgstr ""
 msgid "Error getting packages"
 msgstr ""
 
-#: info.go:83
+#: info.go:76
+msgid "Error iterating over packages"
+msgstr ""
+
+#: info.go:90
 msgid "Command info expected at least 1 argument, got %d"
 msgstr ""
 
-#: info.go:104
+#: info.go:110
 msgid "Error finding packages"
 msgstr ""
 
-#: info.go:118
+#: info.go:124
 msgid "Can't detect system language"
 msgstr ""
 
-#: info.go:135
+#: info.go:141
 msgid "Error resolving overrides"
 msgstr ""
 
-#: info.go:144 info.go:149
+#: info.go:149 info.go:154
 msgid "Error encoding script variables"
 msgstr ""
 
-#: install.go:39
+#: install.go:40
 msgid "Install a new package"
 msgstr ""
 
-#: install.go:51
+#: install.go:52
 msgid "Command install expected at least 1 argument, got %d"
 msgstr ""
 
-#: install.go:113
+#: install.go:114
 msgid "Error when installing the package"
 msgstr ""
 
-#: install.go:151
+#: install.go:159
 msgid "Remove an installed package"
 msgstr ""
 
-#: install.go:170
+#: install.go:178
 msgid "Error listing installed packages"
 msgstr ""
 
-#: install.go:199
+#: install.go:215
 msgid "Command remove expected at least 1 argument, got %d"
 msgstr ""
 
-#: install.go:214
+#: install.go:230
 msgid "Error removing packages"
 msgstr ""
 
-#: internal/build/build.go:376
-msgid "Building package"
-msgstr ""
-
-#: internal/build/build.go:405
-msgid "The checksums array must be the same length as sources"
-msgstr ""
-
-#: internal/build/build.go:447
-msgid "Downloading sources"
-msgstr ""
-
-#: internal/build/build.go:539
-msgid "Installing dependencies"
-msgstr ""
-
-#: internal/build/checker.go:43
-msgid ""
-"Your system's CPU architecture doesn't match this package. Do you want to "
-"build anyway?"
-msgstr ""
-
-#: internal/build/checker.go:67
-msgid "This package is already installed"
-msgstr ""
-
-#: internal/build/find_deps/alt_linux.go:35
-msgid "Command not found on the system"
-msgstr ""
-
-#: internal/build/find_deps/alt_linux.go:86
-msgid "Provided dependency found"
-msgstr ""
-
-#: internal/build/find_deps/alt_linux.go:93
-msgid "Required dependency found"
-msgstr ""
-
-#: internal/build/find_deps/empty.go:32
-msgid "AutoProv is not implemented for this package format, so it's skipped"
-msgstr ""
-
-#: internal/build/find_deps/empty.go:37
-msgid "AutoReq is not implemented for this package format, so it's skipped"
-msgstr ""
-
-#: internal/build/firejail.go:59
-msgid "Applying FireJail integration"
-msgstr ""
-
-#: internal/build/script_executor.go:145
-msgid "Building package metadata"
-msgstr ""
-
-#: internal/build/script_executor.go:285
-msgid "Executing prepare()"
-msgstr ""
-
-#: internal/build/script_executor.go:294
-msgid "Executing build()"
-msgstr ""
-
-#: internal/build/script_executor.go:323 internal/build/script_executor.go:343
-msgid "Executing %s()"
-msgstr ""
-
 #: internal/cliutils/app_builder/builder.go:75
 msgid "Error loading config"
 msgstr ""
@@ -248,15 +186,15 @@ msgstr ""
 msgid "Error initialization database"
 msgstr ""
 
-#: internal/cliutils/app_builder/builder.go:142
+#: internal/cliutils/app_builder/builder.go:135
 msgid "Error pulling repositories"
 msgstr ""
 
-#: internal/cliutils/app_builder/builder.go:159
+#: internal/cliutils/app_builder/builder.go:152
 msgid "Error parsing os release"
 msgstr ""
 
-#: internal/cliutils/app_builder/builder.go:172
+#: internal/cliutils/app_builder/builder.go:165
 msgid "Unable to detect a supported package manager on the system"
 msgstr ""
 
@@ -346,11 +284,11 @@ msgid ""
 "instead!"
 msgstr ""
 
-#: internal/db/db.go:76
+#: internal/db/db.go:137
 msgid "Database version mismatch; resetting"
 msgstr ""
 
-#: internal/db/db.go:82
+#: internal/db/db.go:144
 msgid ""
 "Database version does not exist. Run alr fix if something isn't working."
 msgstr ""
@@ -383,24 +321,6 @@ msgstr ""
 msgid "ERROR"
 msgstr ""
 
-#: internal/repos/pull.go:77
-msgid "Pulling repository"
-msgstr ""
-
-#: internal/repos/pull.go:113
-msgid "Repository up to date"
-msgstr ""
-
-#: internal/repos/pull.go:204
-msgid "Git repository does not appear to be a valid ALR repo"
-msgstr ""
-
-#: internal/repos/pull.go:220
-msgid ""
-"ALR repo's minimum ALR version is greater than the current version. Try "
-"updating ALR if something doesn't work."
-msgstr ""
-
 #: internal/utils/cmd.go:97
 msgid "Error on dropping capabilities"
 msgstr ""
@@ -429,11 +349,11 @@ msgstr ""
 msgid "No packages for upgrade"
 msgstr ""
 
-#: list.go:102 list.go:184
+#: list.go:102 list.go:187
 msgid "Error parsing format template"
 msgstr ""
 
-#: list.go:108 list.go:188
+#: list.go:108 list.go:191
 msgid "Error executing template"
 msgstr ""
 
@@ -457,6 +377,86 @@ msgstr ""
 msgid "Error while running app"
 msgstr ""
 
+#: pkg/build/build.go:395
+msgid "Building package"
+msgstr ""
+
+#: pkg/build/build.go:424
+msgid "The checksums array must be the same length as sources"
+msgstr ""
+
+#: pkg/build/build.go:455
+msgid "Downloading sources"
+msgstr ""
+
+#: pkg/build/build.go:549
+msgid "Installing dependencies"
+msgstr ""
+
+#: pkg/build/checker.go:43
+msgid ""
+"Your system's CPU architecture doesn't match this package. Do you want to "
+"build anyway?"
+msgstr ""
+
+#: pkg/build/checker.go:67
+msgid "This package is already installed"
+msgstr ""
+
+#: pkg/build/find_deps/alt_linux.go:35
+msgid "Command not found on the system"
+msgstr ""
+
+#: pkg/build/find_deps/alt_linux.go:86
+msgid "Provided dependency found"
+msgstr ""
+
+#: pkg/build/find_deps/alt_linux.go:93
+msgid "Required dependency found"
+msgstr ""
+
+#: pkg/build/find_deps/empty.go:32
+msgid "AutoProv is not implemented for this package format, so it's skipped"
+msgstr ""
+
+#: pkg/build/find_deps/empty.go:37
+msgid "AutoReq is not implemented for this package format, so it's skipped"
+msgstr ""
+
+#: pkg/build/script_executor.go:241
+msgid "Building package metadata"
+msgstr ""
+
+#: pkg/build/script_executor.go:372
+msgid "Executing prepare()"
+msgstr ""
+
+#: pkg/build/script_executor.go:381
+msgid "Executing build()"
+msgstr ""
+
+#: pkg/build/script_executor.go:410 pkg/build/script_executor.go:430
+msgid "Executing %s()"
+msgstr ""
+
+#: pkg/repos/pull.go:77
+msgid "Pulling repository"
+msgstr ""
+
+#: pkg/repos/pull.go:113
+msgid "Repository up to date"
+msgstr ""
+
+#: pkg/repos/pull.go:204
+msgid "Git repository does not appear to be a valid ALR repo"
+msgstr ""
+
+#: pkg/repos/pull.go:220
+msgid ""
+"ALR repo's minimum ALR version is greater than the current version. Try "
+"updating ALR if something doesn't work."
+msgstr ""
+
 #: refresh.go:30
 msgid "Pull all repositories that have changed"
 msgstr ""
@@ -465,59 +465,51 @@ msgstr ""
 msgid "Manage repos"
 msgstr ""
 
-#: repo.go:51 repo.go:269
+#: repo.go:50 repo.go:220
 msgid "Remove an existing repository"
 msgstr ""
 
-#: repo.go:53
+#: repo.go:52
 msgid "<name>"
 msgstr ""
 
-#: repo.go:83
+#: repo.go:82
 msgid "Repo \"%s\" does not exist"
 msgstr ""
 
-#: repo.go:90
+#: repo.go:89
 msgid "Error removing repo directory"
 msgstr ""
 
-#: repo.go:94 repo.go:161 repo.go:219
+#: repo.go:93 repo.go:160
 msgid "Error saving config"
 msgstr ""
 
-#: repo.go:113
+#: repo.go:112
 msgid "Error removing packages from database"
 msgstr ""
 
-#: repo.go:124 repo.go:239
+#: repo.go:123 repo.go:190
 msgid "Add a new repository"
 msgstr ""
 
-#: repo.go:125
+#: repo.go:124
 msgid "<name> <url>"
 msgstr ""
 
-#: repo.go:150
+#: repo.go:149
 msgid "Repo \"%s\" already exists"
 msgstr ""
 
-#: repo.go:187
+#: repo.go:197
-msgid "Set the reference of the repository"
-msgstr ""
-
-#: repo.go:188
-msgid "<name> <ref>"
-msgstr ""
-
-#: repo.go:246
 msgid "Name of the new repo"
 msgstr ""
 
-#: repo.go:252
+#: repo.go:203
 msgid "URL of the new repo"
 msgstr ""
 
-#: repo.go:276
+#: repo.go:227
 msgid "Name of the repo to be deleted"
 msgstr ""
 
@@ -545,14 +537,14 @@ msgstr ""
 msgid "Error while executing search"
 msgstr ""
 
-#: upgrade.go:48
+#: upgrade.go:47
 msgid "Upgrade all installed packages"
 msgstr ""
 
-#: upgrade.go:106 upgrade.go:123
+#: upgrade.go:105 upgrade.go:122
 msgid "Error checking for updates"
 msgstr ""
 
-#: upgrade.go:126
+#: upgrade.go:125
 msgid "There is nothing to do."
 msgstr ""

internal/translations/po/ru/default.po

@@ -5,15 +5,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unnamed project\n"
-"PO-Revision-Date: 2025-06-15 16:05+0300\n"
+"PO-Revision-Date: 2025-05-13 23:24+0300\n"
 "Last-Translator: Maxim Slipenko <maks1ms@alt-gnome.ru>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Gtranslator 48.0\n"
 
 #: build.go:42
@@ -65,11 +65,11 @@ msgstr "Ошибка при перемещении пакета"
 msgid "Done"
 msgstr "Сделано"
 
-#: fix.go:39
+#: fix.go:38
 msgid "Attempt to fix problems with ALR"
 msgstr "Попытка устранить проблемы с ALR"
 
-#: fix.go:60
+#: fix.go:59
 msgid "Clearing cache directory"
 msgstr "Очистка каталога кэша"
 
@@ -81,15 +81,15 @@ msgstr "Невозможно открыть каталог кэша"
 msgid "Unable to read cache directory contents"
 msgstr "Невозможно прочитать содержимое каталога кэша"
 
-#: fix.go:82
+#: fix.go:76
 msgid "Unable to remove cache item (%s)"
 msgstr "Невозможно удалить элемент кэша (%s)"
 
-#: fix.go:86
+#: fix.go:80
 msgid "Rebuilding cache"
 msgstr "Восстановление кэша"
 
-#: fix.go:90
+#: fix.go:84
 msgid "Unable to create new cache directory"
 msgstr "Не удалось создать новый каталог кэша"
 
@@ -133,124 +133,58 @@ msgstr "Показывать всю информацию, не только дл
 msgid "Error getting packages"
 msgstr "Ошибка при получении пакетов"
 
-#: info.go:83
+#: info.go:76
+msgid "Error iterating over packages"
+msgstr "Ошибка при переборе пакетов"
+
+#: info.go:90
 msgid "Command info expected at least 1 argument, got %d"
 msgstr "Для команды info ожидался хотя бы 1 аргумент, получено %d"
 
-#: info.go:104
+#: info.go:110
 msgid "Error finding packages"
 msgstr "Ошибка при поиске пакетов"
 
-#: info.go:118
+#: info.go:124
 msgid "Can't detect system language"
 msgstr "Ошибка при определении языка системы"
 
-#: info.go:135
+#: info.go:141
 msgid "Error resolving overrides"
 msgstr "Ошибка устранения переорпеделений"
 
-#: info.go:144 info.go:149
+#: info.go:149 info.go:154
 msgid "Error encoding script variables"
 msgstr "Ошибка кодирования переменных скрита"
 
-#: install.go:39
+#: install.go:40
 msgid "Install a new package"
 msgstr "Установить новый пакет"
 
-#: install.go:51
+#: install.go:52
 msgid "Command install expected at least 1 argument, got %d"
 msgstr "Для команды install ожидался хотя бы 1 аргумент, получено %d"
 
-#: install.go:113
+#: install.go:114
 msgid "Error when installing the package"
 msgstr "Ошибка при установке пакета"
 
-#: install.go:151
+#: install.go:159
 msgid "Remove an installed package"
 msgstr "Удалить установленный пакет"
 
-#: install.go:170
+#: install.go:178
 msgid "Error listing installed packages"
 msgstr "Ошибка при составлении списка установленных пакетов"
 
-#: install.go:199
+#: install.go:215
 msgid "Command remove expected at least 1 argument, got %d"
 msgstr "Для команды remove ожидался хотя бы 1 аргумент, получено %d"
 
-#: install.go:214
+#: install.go:230
 msgid "Error removing packages"
 msgstr "Ошибка при удалении пакетов"
 
-#: internal/build/build.go:376
-msgid "Building package"
-msgstr "Сборка пакета"
-
-#: internal/build/build.go:405
-msgid "The checksums array must be the same length as sources"
-msgstr "Массив контрольных сумм должен быть той же длины, что и источники"
-
-#: internal/build/build.go:447
-msgid "Downloading sources"
-msgstr "Скачивание источников"
-
-#: internal/build/build.go:539
-msgid "Installing dependencies"
-msgstr "Установка зависимостей"
-
-#: internal/build/checker.go:43
-msgid ""
-"Your system's CPU architecture doesn't match this package. Do you want to "
-"build anyway?"
-msgstr ""
-"Архитектура процессора вашей системы не соответствует этому пакету. Вы все "
-"равно хотите выполнить сборку?"
-
-#: internal/build/checker.go:67
-msgid "This package is already installed"
-msgstr "Этот пакет уже установлен"
-
-#: internal/build/find_deps/alt_linux.go:35
-msgid "Command not found on the system"
-msgstr "Команда не найдена в системе"
-
-#: internal/build/find_deps/alt_linux.go:86
-msgid "Provided dependency found"
-msgstr "Найденная предоставленная зависимость"
-
-#: internal/build/find_deps/alt_linux.go:93
-msgid "Required dependency found"
-msgstr "Найдена требуемая зависимость"
-
-#: internal/build/find_deps/empty.go:32
-msgid "AutoProv is not implemented for this package format, so it's skipped"
-msgstr ""
-"AutoProv не реализовано для этого формата пакета, поэтому будет пропущено"
-
-#: internal/build/find_deps/empty.go:37
-msgid "AutoReq is not implemented for this package format, so it's skipped"
-msgstr ""
-"AutoReq не реализовано для этого формата пакета, поэтому будет пропущено"
-
-#: internal/build/firejail.go:59
-msgid "Applying FireJail integration"
-msgstr "Применение интеграции FireJail"
-
-#: internal/build/script_executor.go:145
-msgid "Building package metadata"
-msgstr "Сборка метаданных пакета"
-
-#: internal/build/script_executor.go:285
-msgid "Executing prepare()"
-msgstr "Выполнение prepare()"
-
-#: internal/build/script_executor.go:294
-msgid "Executing build()"
-msgstr "Выполнение build()"
-
-#: internal/build/script_executor.go:323 internal/build/script_executor.go:343
-msgid "Executing %s()"
-msgstr "Выполнение %s()"
-
 #: internal/cliutils/app_builder/builder.go:75
 msgid "Error loading config"
 msgstr "Ошибка при загрузке"
@@ -259,15 +193,15 @@ msgstr "Ошибка при загрузке"
 msgid "Error initialization database"
 msgstr "Ошибка инициализации базы данных"
 
-#: internal/cliutils/app_builder/builder.go:142
+#: internal/cliutils/app_builder/builder.go:135
 msgid "Error pulling repositories"
 msgstr "Ошибка при извлечении репозиториев"
 
-#: internal/cliutils/app_builder/builder.go:159
+#: internal/cliutils/app_builder/builder.go:152
 msgid "Error parsing os release"
 msgstr "Ошибка при разборе файла выпуска операционной системы"
 
-#: internal/cliutils/app_builder/builder.go:172
+#: internal/cliutils/app_builder/builder.go:165
 msgid "Unable to detect a supported package manager on the system"
 msgstr "Не удалось обнаружить поддерживаемый менеджер пакетов в системе"
 
@@ -356,14 +290,12 @@ msgid ""
 "This command is deprecated and would be removed in the future, use \"%s\" "
 "instead!"
 msgstr ""
-"Эта команда устарела и будет удалена в будущем, используйте вместо нее "
-"\"%s\"!"
 
-#: internal/db/db.go:76
+#: internal/db/db.go:137
 msgid "Database version mismatch; resetting"
 msgstr "Несоответствие версий базы данных; сброс настроек"
 
-#: internal/db/db.go:82
+#: internal/db/db.go:144
 msgid ""
 "Database version does not exist. Run alr fix if something isn't working."
 msgstr ""
@@ -397,26 +329,6 @@ msgstr "%s %s загружается — %s/с\n"
 msgid "ERROR"
 msgstr "ОШИБКА"
 
-#: internal/repos/pull.go:77
-msgid "Pulling repository"
-msgstr "Скачивание репозитория"
-
-#: internal/repos/pull.go:113
-msgid "Repository up to date"
-msgstr "Репозиторий уже обновлён"
-
-#: internal/repos/pull.go:204
-msgid "Git repository does not appear to be a valid ALR repo"
-msgstr "Репозиторий Git не поддерживается репозиторием ALR"
-
-#: internal/repos/pull.go:220
-msgid ""
-"ALR repo's minimum ALR version is greater than the current version. Try "
-"updating ALR if something doesn't work."
-msgstr ""
-"Минимальная версия ALR для ALR-репозитория выше текущей версии. Попробуйте "
-"обновить ALR, если что-то не работает."
-
 #: internal/utils/cmd.go:97
 msgid "Error on dropping capabilities"
 msgstr "Ошибка при понижении привилегий"
@@ -445,11 +357,11 @@ msgstr "Ошибка при получении пакетов для обнов
 msgid "No packages for upgrade"
 msgstr "Нет пакетов к обновлению"
 
-#: list.go:102 list.go:184
+#: list.go:102 list.go:187
 msgid "Error parsing format template"
 msgstr "Ошибка при разборе шаблона"
 
-#: list.go:108 list.go:188
+#: list.go:108 list.go:191
 msgid "Error executing template"
 msgstr "Ошибка при выполнении шаблона"
 
@@ -473,67 +385,145 @@ msgstr "Показать справку"
 msgid "Error while running app"
 msgstr "Ошибка при запуске приложения"
 
+#: pkg/build/build.go:395
+msgid "Building package"
+msgstr "Сборка пакета"
+
+#: pkg/build/build.go:424
+msgid "The checksums array must be the same length as sources"
+msgstr "Массив контрольных сумм должен быть той же длины, что и источники"
+
+#: pkg/build/build.go:455
+msgid "Downloading sources"
+msgstr "Скачивание источников"
+
+#: pkg/build/build.go:549
+msgid "Installing dependencies"
+msgstr "Установка зависимостей"
+
+#: pkg/build/checker.go:43
+msgid ""
+"Your system's CPU architecture doesn't match this package. Do you want to "
+"build anyway?"
+msgstr ""
+"Архитектура процессора вашей системы не соответствует этому пакету. Вы все "
+"равно хотите выполнить сборку?"
+
+#: pkg/build/checker.go:67
+msgid "This package is already installed"
+msgstr "Этот пакет уже установлен"
+
+#: pkg/build/find_deps/alt_linux.go:35
+msgid "Command not found on the system"
+msgstr "Команда не найдена в системе"
+
+#: pkg/build/find_deps/alt_linux.go:86
+msgid "Provided dependency found"
+msgstr "Найденная предоставленная зависимость"
+
+#: pkg/build/find_deps/alt_linux.go:93
+msgid "Required dependency found"
+msgstr "Найдена требуемая зависимость"
+
+#: pkg/build/find_deps/empty.go:32
+msgid "AutoProv is not implemented for this package format, so it's skipped"
+msgstr ""
+"AutoProv не реализовано для этого формата пакета, поэтому будет пропущено"
+
+#: pkg/build/find_deps/empty.go:37
+msgid "AutoReq is not implemented for this package format, so it's skipped"
+msgstr ""
+"AutoReq не реализовано для этого формата пакета, поэтому будет пропущено"
+
+#: pkg/build/script_executor.go:241
+msgid "Building package metadata"
+msgstr "Сборка метаданных пакета"
+
+#: pkg/build/script_executor.go:372
+msgid "Executing prepare()"
+msgstr "Выполнение prepare()"
+
+#: pkg/build/script_executor.go:381
+msgid "Executing build()"
+msgstr "Выполнение build()"
+
+#: pkg/build/script_executor.go:410 pkg/build/script_executor.go:430
+msgid "Executing %s()"
+msgstr "Выполнение %s()"
+
+#: pkg/repos/pull.go:77
+msgid "Pulling repository"
+msgstr "Скачивание репозитория"
+
+#: pkg/repos/pull.go:113
+msgid "Repository up to date"
+msgstr "Репозиторий уже обновлён"
+
+#: pkg/repos/pull.go:204
+msgid "Git repository does not appear to be a valid ALR repo"
+msgstr "Репозиторий Git не поддерживается репозиторием ALR"
+
+#: pkg/repos/pull.go:220
+msgid ""
+"ALR repo's minimum ALR version is greater than the current version. Try "
+"updating ALR if something doesn't work."
+msgstr ""
+"Минимальная версия ALR для ALR-репозитория выше текущей версии. Попробуйте "
+"обновить ALR, если что-то не работает."
+
 #: refresh.go:30
 msgid "Pull all repositories that have changed"
 msgstr "Скачать все изменённые репозитории"
 
 #: repo.go:39
 msgid "Manage repos"
-msgstr "Управление репозиториями"
+msgstr ""
 
-#: repo.go:51 repo.go:269
+#: repo.go:50 repo.go:220
 msgid "Remove an existing repository"
 msgstr "Удалить существующий репозиторий"
 
-#: repo.go:53
+#: repo.go:52
 msgid "<name>"
-msgstr "<имя>"
+msgstr ""
 
-#: repo.go:83
+#: repo.go:82
 msgid "Repo \"%s\" does not exist"
 msgstr "Репозитория \"%s\" не существует"
 
-#: repo.go:90
+#: repo.go:89
 msgid "Error removing repo directory"
 msgstr "Ошибка при удалении каталога репозитория"
 
-#: repo.go:94 repo.go:161 repo.go:219
+#: repo.go:93 repo.go:160
 msgid "Error saving config"
 msgstr "Ошибка при сохранении конфигурации"
 
-#: repo.go:113
+#: repo.go:112
 msgid "Error removing packages from database"
 msgstr "Ошибка при удалении пакетов из базы данных"
 
-#: repo.go:124 repo.go:239
+#: repo.go:123 repo.go:190
 msgid "Add a new repository"
 msgstr "Добавить новый репозиторий"
 
-#: repo.go:125
+#: repo.go:124
 msgid "<name> <url>"
-msgstr "<имя> <url>"
+msgstr ""
 
-#: repo.go:150
+#: repo.go:149
 msgid "Repo \"%s\" already exists"
 msgstr "Репозиторий \"%s\" уже существует"
 
-#: repo.go:187
+#: repo.go:197
-msgid "Set the reference of the repository"
-msgstr "Установить ссылку на версию репозитория"
-
-#: repo.go:188
-msgid "<name> <ref>"
-msgstr "<имя> <ссылка_на_версию>"
-
-#: repo.go:246
 msgid "Name of the new repo"
 msgstr "Название нового репозитория"
 
-#: repo.go:252
+#: repo.go:203
 msgid "URL of the new repo"
 msgstr "URL-адрес нового репозитория"
 
-#: repo.go:276
+#: repo.go:227
 msgid "Name of the repo to be deleted"
 msgstr "Название репозитория  удалён"
 
@@ -561,25 +551,18 @@ msgstr "Иcкать по provides"
 msgid "Error while executing search"
 msgstr "Ошибка при выполнении поиска"
 
-#: upgrade.go:48
+#: upgrade.go:47
 msgid "Upgrade all installed packages"
 msgstr "Обновить все установленные пакеты"
 
-#: upgrade.go:106 upgrade.go:123
+#: upgrade.go:105 upgrade.go:122
 msgid "Error checking for updates"
 msgstr "Ошибка при проверке обновлений"
 
-#: upgrade.go:126
+#: upgrade.go:125
 msgid "There is nothing to do."
 msgstr "Здесь нечего делать."
 
-#, fuzzy
-#~ msgid "Failed to clear contents of cache directory"
-#~ msgstr "Не удалось создать каталог кэша репозитория"
-
-#~ msgid "Error iterating over packages"
-#~ msgstr "Ошибка при переборе пакетов"
-
 #~ msgid "Error pulling repos"
 #~ msgstr "Ошибка при извлечении репозиториев"
 
@@ -595,6 +578,9 @@ msgstr "Здесь нечего делать."
 #~ msgid "Unable to create config directory"
 #~ msgstr "Не удалось создать каталог конфигурации ALR"
 
+#~ msgid "Unable to create repo cache directory"
+#~ msgstr "Не удалось создать каталог кэша репозитория"
+
 #~ msgid "Unable to create package cache directory"
 #~ msgstr "Не удалось создать каталог кэша пакетов"
 

internal/types/build.go

@@ -24,6 +24,49 @@ type BuildOpts struct {
 	Interactive bool
 }
 
+type BuildVarsPre struct {
+	Version          string   `sh:"version,required"`
+	Release          int      `sh:"release,required"`
+	Epoch            uint     `sh:"epoch"`
+	Summary          string   `sh:"summary"`
+	Description      string   `sh:"desc"`
+	Group            string   `sh:"group"`
+	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"`
+	AutoReqSkipList  []string `sh:"auto_req_skiplist"`
+	AutoProvSkipList []string `sh:"auto_prov_skiplist"`
+}
+
+func (bv *BuildVarsPre) ToBuildVars() BuildVars {
+	return BuildVars{
+		Name:         "",
+		Base:         "",
+		BuildVarsPre: *bv,
+	}
+}
+
+// BuildVars represents the script variables required
+// to build a package
+type BuildVars struct {
+	Name string `sh:"name,required"`
+	Base string
+	BuildVarsPre
+}
+
 type Scripts struct {
 	PreInstall  string `sh:"preinstall"`
 	PostInstall string `sh:"postinstall"`

list.go

@@ -29,12 +29,12 @@ import (
 	"github.com/leonelquinteros/gotext"
 	"github.com/urfave/cli/v2"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/build"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
 	appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/manager"
+	database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/utils"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 )
 
 func ListCmd() *cli.Command {
@@ -69,9 +69,9 @@ func ListCmd() *cli.Command {
 				WithConfig().
 				WithDB().
 				WithManager().
-				WithDistroInfo().
 				// autoPull only
 				WithRepos().
+				WithDistroInfo().
 				Build()
 			if err != nil {
 				return err
@@ -125,6 +125,7 @@ func ListCmd() *cli.Command {
 			if err != nil {
 				return cliutils.FormatCliExit(gotext.Get("Error getting packages"), err)
 			}
+			defer result.Close()
 
 			installedAlrPackages := map[string]string{}
 			if c.Bool("installed") {
@@ -149,7 +150,9 @@ func ListCmd() *cli.Command {
 				}
 			}
 
-			for _, pkg := range result {
+			for result.Next() {
+				var pkg database.Package
+				err := result.StructScan(&pkg)
 				if err != nil {
 					return cli.Exit(err, 1)
 				}
@@ -159,7 +162,7 @@ func ListCmd() *cli.Command {
 				}
 
 				type packageInfo struct {
-					Package *alrsh.Package
+					Package *database.Package
 					Version string
 				}
 

main.go

@@ -33,8 +33,8 @@ import (
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/manager"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/translations"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/logger"
 )

old-files

@@ -52,9 +52,9 @@
 ./internal/translations/files/lure.en.toml
 ./internal/translations/files/lure.ru.toml
 ./internal/translations/translations.go
-./pkg/types/build.go
+./internal/types/build.go
-./pkg/types/config.go
+./internal/types/config.go
-./pkg/types/repo.go
+./internal/types/repo.go
 ./list.go
 ./main.go
 ./pkg/build/build.go

pkg/alrsh/alrsh.go

@@ -1,205 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 The ALR Authors
-//
-// 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 alrsh
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strconv"
-	"strings"
-
-	"mvdan.cc/sh/v3/expand"
-	"mvdan.cc/sh/v3/interp"
-	"mvdan.cc/sh/v3/syntax"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu"
-	"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/shutils/helpers"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
-)
-
-type ScriptFile struct {
-	file *syntax.File
-	path string
-}
-
-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
-}
-
-func (s *ScriptFile) ParseBuildVars(ctx context.Context, info *distro.OSRelease, packages []string) (string, []*Package, error) {
-	runner, err := s.createRunner(info)
-	if err != nil {
-		return "", nil, err
-	}
-
-	if err := runScript(ctx, runner, s.file); err != nil {
-		return "", nil, err
-	}
-
-	dec := newDecoder(info, runner)
-
-	pkgNames, err := ParseNames(dec)
-	if err != nil {
-		return "", nil, err
-	}
-
-	if len(pkgNames.Names) == 0 {
-		return "", nil, errors.New("package name is missing")
-	}
-
-	targetPackages := packages
-	if len(targetPackages) == 0 {
-		targetPackages = pkgNames.Names
-	}
-
-	varsOfPackages, err := s.createPackagesForBuildVars(ctx, dec, pkgNames, targetPackages)
-	if err != nil {
-		return "", nil, err
-	}
-
-	baseName := pkgNames.BasePkgName
-	if len(pkgNames.Names) == 1 {
-		baseName = pkgNames.Names[0]
-	}
-
-	return baseName, varsOfPackages, nil
-}
-
-func (s *ScriptFile) createRunner(info *distro.OSRelease) (*interp.Runner, error) {
-	scriptDir := filepath.Dir(s.path)
-	env := createBuildEnvVars(info, types.Directories{ScriptDir: scriptDir})
-
-	return interp.New(
-		interp.Env(expand.ListEnviron(env...)),
-		interp.StdIO(os.Stdin, os.Stderr, os.Stderr),
-		interp.ExecHandler(helpers.Restricted.ExecHandler(handlers.NopExec)),
-		interp.ReadDirHandler2(handlers.RestrictedReadDir(scriptDir)),
-		interp.StatHandler(handlers.RestrictedStat(scriptDir)),
-		interp.OpenHandler(handlers.RestrictedOpen(scriptDir)),
-		interp.Dir(scriptDir),
-	)
-}
-
-func (s *ScriptFile) createPackagesForBuildVars(
-	ctx context.Context,
-	dec *decoder.Decoder,
-	pkgNames *PackageNames,
-	targetPackages []string,
-) ([]*Package, error) {
-	var varsOfPackages []*Package
-
-	if len(pkgNames.Names) == 1 {
-		var pkg Package
-		pkg.Name = pkgNames.Names[0]
-		if err := dec.DecodeVars(&pkg); err != nil {
-			return nil, err
-		}
-		varsOfPackages = append(varsOfPackages, &pkg)
-		return varsOfPackages, nil
-	}
-
-	for _, pkgName := range targetPackages {
-		pkg, err := s.createPackageFromMeta(ctx, dec, pkgName, pkgNames.BasePkgName)
-		if err != nil {
-			return nil, err
-		}
-		varsOfPackages = append(varsOfPackages, pkg)
-	}
-
-	return varsOfPackages, nil
-}
-
-func (s *ScriptFile) createPackageFromMeta(
-	ctx context.Context,
-	dec *decoder.Decoder,
-	pkgName, basePkgName string,
-) (*Package, error) {
-	funcName := fmt.Sprintf("meta_%s", pkgName)
-	meta, ok := dec.GetFuncWithSubshell(funcName)
-	if !ok {
-		return nil, fmt.Errorf("func %s is missing", funcName)
-	}
-
-	metaRunner, err := meta(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	metaDecoder := decoder.New(&distro.OSRelease{}, metaRunner)
-
-	var vars Package
-	if err := metaDecoder.DecodeVars(&vars); err != nil {
-		return nil, err
-	}
-
-	vars.Name = pkgName
-	vars.BasePkgName = basePkgName
-
-	return &vars, nil
-}
-
-func runScript(ctx context.Context, runner *interp.Runner, fl *syntax.File) error {
-	runner.Reset()
-	return runner.Run(ctx, fl)
-}
-
-func newDecoder(info *distro.OSRelease, runner *interp.Runner) *decoder.Decoder {
-	d := decoder.New(info, runner)
-	// d.Overrides = false
-	// d.LikeDistros = false
-	return d
-}
-
-func (a *ScriptFile) Path() string {
-	return a.path
-}
-
-func (a *ScriptFile) File() *syntax.File {
-	return a.file
-}

pkg/alrsh/gob.go

@@ -1,61 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 The ALR Authors
-//
-// 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 alrsh
-
-import (
-	"bytes"
-	"encoding/gob"
-
-	"mvdan.cc/sh/v3/syntax"
-	"mvdan.cc/sh/v3/syntax/typedjson"
-)
-
-func (s *ScriptFile) GobEncode() ([]byte, error) {
-	var buf bytes.Buffer
-	enc := gob.NewEncoder(&buf)
-	if err := enc.Encode(s.path); err != nil {
-		return nil, err
-	}
-	var fileBuf bytes.Buffer
-	if err := typedjson.Encode(&fileBuf, s.file); err != nil {
-		return nil, err
-	}
-	fileData := fileBuf.Bytes()
-	if err := enc.Encode(fileData); err != nil {
-		return nil, err
-	}
-	return buf.Bytes(), nil
-}
-
-func (s *ScriptFile) GobDecode(data []byte) error {
-	buf := bytes.NewBuffer(data)
-	dec := gob.NewDecoder(buf)
-	if err := dec.Decode(&s.path); err != nil {
-		return err
-	}
-	var fileData []byte
-	if err := dec.Decode(&fileData); err != nil {
-		return err
-	}
-	fileReader := bytes.NewReader(fileData)
-	file, err := typedjson.Decode(fileReader)
-	if err != nil {
-		return err
-	}
-	s.file = file.(*syntax.File)
-	return nil
-}

pkg/alrsh/overridable.go

@@ -1,146 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 The ALR Authors
-//
-// 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 alrsh
-
-import (
-	"bytes"
-	"encoding/gob"
-	"encoding/json"
-)
-
-type OverridableField[T any] struct {
-	data map[string]T
-	// It can't be a pointer
-	//
-	// See https://gitea.com/xorm/xorm/issues/2431
-	resolved T
-}
-
-func (f *OverridableField[T]) Set(key string, value T) {
-	if f.data == nil {
-		f.data = make(map[string]T)
-	}
-	f.data[key] = value
-}
-
-func (f *OverridableField[T]) Get(key string) T {
-	if f.data == nil {
-		f.data = make(map[string]T)
-	}
-	return f.data[key]
-}
-
-func (f *OverridableField[T]) Has(key string) (T, bool) {
-	if f.data == nil {
-		f.data = make(map[string]T)
-	}
-	val, ok := f.data[key]
-	return val, ok
-}
-
-func (f *OverridableField[T]) SetResolved(value T) {
-	f.resolved = value
-}
-
-func (f *OverridableField[T]) Resolved() T {
-	return f.resolved
-}
-
-func (f *OverridableField[T]) All() map[string]T {
-	return f.data
-}
-
-func (o *OverridableField[T]) Resolve(overrides []string) {
-	for _, override := range overrides {
-		if v, ok := o.Has(override); ok {
-			o.SetResolved(v)
-		}
-	}
-}
-
-func (f *OverridableField[T]) ToDB() ([]byte, error) {
-	var data map[string]T
-
-	if f.data == nil {
-		data = make(map[string]T)
-	} else {
-		data = f.data
-	}
-
-	return json.Marshal(data)
-}
-
-func (f *OverridableField[T]) FromDB(data []byte) error {
-	if len(data) == 0 {
-		*f = OverridableField[T]{data: make(map[string]T)}
-		return nil
-	}
-
-	var temp map[string]T
-	if err := json.Unmarshal(data, &temp); err != nil {
-		return err
-	}
-
-	if temp == nil {
-		temp = make(map[string]T)
-	}
-
-	*f = OverridableField[T]{data: temp}
-	return nil
-}
-
-type overridableFieldGobPayload[T any] struct {
-	Data     map[string]T
-	Resolved T
-}
-
-func (f *OverridableField[T]) GobEncode() ([]byte, error) {
-	var buf bytes.Buffer
-	enc := gob.NewEncoder(&buf)
-
-	payload := overridableFieldGobPayload[T]{
-		Data:     f.data,
-		Resolved: f.resolved,
-	}
-
-	if err := enc.Encode(payload); err != nil {
-		return nil, err
-	}
-	return buf.Bytes(), nil
-}
-
-func (f *OverridableField[T]) GobDecode(data []byte) error {
-	dec := gob.NewDecoder(bytes.NewBuffer(data))
-
-	var payload overridableFieldGobPayload[T]
-	if err := dec.Decode(&payload); err != nil {
-		return err
-	}
-
-	f.data = payload.Data
-	f.resolved = payload.Resolved
-	return nil
-}
-
-func OverridableFromMap[T any](data map[string]T) OverridableField[T] {
-	if data == nil {
-		data = make(map[string]T)
-	}
-	return OverridableField[T]{
-		data: data,
-	}
-}

pkg/alrsh/package.go

@@ -1,108 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 The ALR Authors
-//
-// 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 alrsh
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder"
-)
-
-type PackageNames struct {
-	BasePkgName string   `sh:"basepkg_name"`
-	Names       []string `sh:"name"`
-}
-
-func ParseNames(dec *decoder.Decoder) (*PackageNames, error) {
-	var pkgs PackageNames
-	err := dec.DecodeVars(&pkgs)
-	if err != nil {
-		return nil, fmt.Errorf("fail parse names: %w", err)
-	}
-	return &pkgs, nil
-}
-
-type Package struct {
-	Repository  string `xorm:"pk 'repository'"`
-	Name        string `xorm:"pk 'name'"`
-	BasePkgName string `xorm:"notnull 'basepkg_name'"`
-
-	Version       string   `sh:"version" xorm:"notnull 'version'"`
-	Release       int      `sh:"release" xorm:"notnull 'release'"`
-	Epoch         uint     `sh:"epoch" xorm:"'epoch'"`
-	Architectures []string `sh:"architectures" xorm:"json 'architectures'"`
-	Licenses      []string `sh:"license" xorm:"json 'licenses'"`
-	Provides      []string `sh:"provides" xorm:"json 'provides'"`
-	Conflicts     []string `sh:"conflicts" xorm:"json 'conflicts'"`
-	Replaces      []string `sh:"replaces" xorm:"json 'replaces'"`
-
-	Summary          OverridableField[string]   `sh:"summary" xorm:"'summary'"`
-	Description      OverridableField[string]   `sh:"desc" xorm:"'description'"`
-	Group            OverridableField[string]   `sh:"group" xorm:"'group_name'"`
-	Homepage         OverridableField[string]   `sh:"homepage" xorm:"'homepage'"`
-	Maintainer       OverridableField[string]   `sh:"maintainer" xorm:"'maintainer'"`
-	Depends          OverridableField[[]string] `sh:"deps" xorm:"'depends'"`
-	BuildDepends     OverridableField[[]string] `sh:"build_deps" xorm:"'builddepends'"`
-	OptDepends       OverridableField[[]string] `sh:"opt_deps" xorm:"'optdepends'"`
-	Sources          OverridableField[[]string] `sh:"sources" xorm:"-"`
-	Checksums        OverridableField[[]string] `sh:"checksums" xorm:"-"`
-	Backup           OverridableField[[]string] `sh:"backup" xorm:"-"`
-	Scripts          OverridableField[Scripts]  `sh:"scripts" xorm:"-"`
-	AutoReq          OverridableField[[]string] `sh:"auto_req" xorm:"-"`
-	AutoProv         OverridableField[[]string] `sh:"auto_prov" xorm:"-"`
-	AutoReqSkipList  OverridableField[[]string] `sh:"auto_req_skiplist" xorm:"-"`
-	AutoProvSkipList OverridableField[[]string] `sh:"auto_prov_skiplist" xorm:"-"`
-
-	FireJailed       OverridableField[bool]              `sh:"firejailed" xorm:"-"`
-	FireJailProfiles OverridableField[map[string]string] `sh:"firejail_profiles" xorm:"-"`
-}
-
-type Scripts struct {
-	PreInstall  string `sh:"preinstall"`
-	PostInstall string `sh:"postinstall"`
-	PreRemove   string `sh:"preremove"`
-	PostRemove  string `sh:"postremove"`
-	PreUpgrade  string `sh:"preupgrade"`
-	PostUpgrade string `sh:"postupgrade"`
-	PreTrans    string `sh:"pretrans"`
-	PostTrans   string `sh:"posttrans"`
-}
-
-func ResolvePackage(p *Package, overrides []string) {
-	val := reflect.ValueOf(p).Elem()
-	typ := val.Type()
-
-	for i := range val.NumField() {
-		field := val.Field(i)
-		fieldType := typ.Field(i)
-
-		if !field.CanInterface() {
-			continue
-		}
-
-		if field.Kind() == reflect.Struct && strings.HasPrefix(fieldType.Type.String(), "alrsh.OverridableField") {
-			of := field.Addr().Interface()
-			if res, ok := of.(interface {
-				Resolve([]string)
-			}); ok {
-				res.Resolve(overrides)
-			}
-		}
-	}
-}

pkg/alrsh/read.go

@@ -1,57 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 The ALR Authors
-//
-// 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 alrsh
-
-import (
-	"fmt"
-	"io"
-	"io/fs"
-	"os"
-
-	"mvdan.cc/sh/v3/syntax"
-)
-
-type localFs struct{}
-
-func (fs *localFs) Open(name string) (fs.File, error) {
-	return os.Open(name)
-}
-
-func ReadFromIOReader(r io.Reader, script string) (*ScriptFile, error) {
-	file, err := syntax.NewParser().Parse(r, "alr.sh")
-	if err != nil {
-		return nil, err
-	}
-	return &ScriptFile{
-		file: file,
-		path: script,
-	}, nil
-}
-
-func ReadFromFS(fsys fs.FS, script string) (*ScriptFile, error) {
-	fl, err := fsys.Open(script)
-	if err != nil {
-		return nil, fmt.Errorf("failed to open alr.sh: %w", err)
-	}
-	defer fl.Close()
-
-	return ReadFromIOReader(fl, script)
-}
-
-func ReadFromLocal(script string) (*ScriptFile, error) {
-	return ReadFromFS(&localFs{}, script)
-}

pkg/build/build.go

@@ -24,17 +24,18 @@ import (
 	"context"
 	"encoding/gob"
 	"errors"
-	"fmt"
 	"log/slog"
 
 	"github.com/leonelquinteros/gotext"
+	"mvdan.cc/sh/v3/syntax"
+	"mvdan.cc/sh/v3/syntax/typedjson"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/manager"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
+	"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/types"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 )
 
 type BuildInput struct {
@@ -132,33 +133,54 @@ type RepositoryProvider interface {
 
 // ================================================
 
-type BuiltDep struct {
+type ScriptFile struct {
-	Name string
+	File *syntax.File
 	Path string
 }
 
-func Map[T, R any](items []T, f func(T) R) []R {
+func (s *ScriptFile) GobEncode() ([]byte, error) {
-	res := make([]R, len(items))
+	var buf bytes.Buffer
-	for i, item := range items {
+	enc := gob.NewEncoder(&buf)
-		res[i] = f(item)
+	if err := enc.Encode(s.Path); err != nil {
+		return nil, err
 	}
-	return res
+	var fileBuf bytes.Buffer
+	if err := typedjson.Encode(&fileBuf, s.File); err != nil {
+		return nil, err
+	}
+	fileData := fileBuf.Bytes()
+	if err := enc.Encode(fileData); err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
 }
 
-func GetBuiltPaths(deps []*BuiltDep) []string {
+func (s *ScriptFile) GobDecode(data []byte) error {
-	return Map(deps, func(dep *BuiltDep) string {
+	buf := bytes.NewBuffer(data)
-		return dep.Path
+	dec := gob.NewDecoder(buf)
-	})
+	if err := dec.Decode(&s.Path); err != nil {
+		return err
+	}
+	var fileData []byte
+	if err := dec.Decode(&fileData); err != nil {
+		return err
+	}
+	fileReader := bytes.NewReader(fileData)
+	file, err := typedjson.Decode(fileReader)
+	if err != nil {
+		return err
+	}
+	s.File = file.(*syntax.File)
+	return nil
 }
 
-func GetBuiltName(deps []*BuiltDep) []string {
+type BuildResult struct {
-	return Map(deps, func(dep *BuiltDep) string {
+	PackagePaths []string
-		return dep.Name
+	PackageNames []string
-	})
 }
 
 type PackageFinder interface {
-	FindPkgs(ctx context.Context, pkgs []string) (map[string][]alrsh.Package, []string, error)
+	FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error)
 }
 
 type Config interface {
@@ -173,12 +195,12 @@ type FunctionsOutput struct {
 // EXECUTORS
 
 type ScriptResolverExecutor interface {
-	ResolveScript(ctx context.Context, pkg *alrsh.Package) *ScriptInfo
+	ResolveScript(ctx context.Context, pkg *db.Package) *ScriptInfo
 }
 
 type ScriptExecutor interface {
-	ReadScript(ctx context.Context, scriptPath string) (*alrsh.ScriptFile, error)
+	ReadScript(ctx context.Context, scriptPath string) (*ScriptFile, error)
-	ExecuteFirstPass(ctx context.Context, input *BuildInput, sf *alrsh.ScriptFile) (string, []*alrsh.Package, error)
+	ExecuteFirstPass(ctx context.Context, input *BuildInput, sf *ScriptFile) (string, []*types.BuildVars, error)
 	PrepareDirs(
 		ctx context.Context,
 		input *BuildInput,
@@ -187,27 +209,27 @@ type ScriptExecutor interface {
 	ExecuteSecondPass(
 		ctx context.Context,
 		input *BuildInput,
-		sf *alrsh.ScriptFile,
+		sf *ScriptFile,
-		varsOfPackages []*alrsh.Package,
+		varsOfPackages []*types.BuildVars,
 		repoDeps []string,
-		builtDeps []*BuiltDep,
+		builtNames []string,
 		basePkg string,
-	) ([]*BuiltDep, error)
+	) (*SecondPassResult, error)
 }
 
 type CacheExecutor interface {
-	CheckForBuiltPackage(ctx context.Context, input *BuildInput, vars *alrsh.Package) (string, bool, error)
+	CheckForBuiltPackage(ctx context.Context, input *BuildInput, vars *types.BuildVars) (string, bool, error)
 }
 
 type ScriptViewerExecutor interface {
-	ViewScript(ctx context.Context, input *BuildInput, sf *alrsh.ScriptFile, basePkg string) error
+	ViewScript(ctx context.Context, input *BuildInput, sf *ScriptFile, basePkg string) error
 }
 
 type CheckerExecutor interface {
 	PerformChecks(
 		ctx context.Context,
 		input *BuildInput,
-		vars *alrsh.Package,
+		vars *types.BuildVars,
 	) (bool, error)
 }
 
@@ -285,7 +307,7 @@ func (b *BuildArgs) PkgFormat() string {
 
 type BuildPackageFromDbArgs struct {
 	BuildArgs
-	Package  *alrsh.Package
+	Package  *db.Package
 	Packages []string
 }
 
@@ -298,7 +320,7 @@ type BuildPackageFromScriptArgs struct {
 func (b *Builder) BuildPackageFromDb(
 	ctx context.Context,
 	args *BuildPackageFromDbArgs,
-) ([]*BuiltDep, error) {
+) (*BuildResult, error) {
 	scriptInfo := b.scriptResolver.ResolveScript(ctx, args.Package)
 
 	return b.BuildPackage(ctx, &BuildInput{
@@ -314,7 +336,7 @@ func (b *Builder) BuildPackageFromDb(
 func (b *Builder) BuildPackageFromScript(
 	ctx context.Context,
 	args *BuildPackageFromScriptArgs,
-) ([]*BuiltDep, error) {
+) (*BuildResult, error) {
 	return b.BuildPackage(ctx, &BuildInput{
 		script:     args.Script,
 		repository: "default",
@@ -328,46 +350,43 @@ func (b *Builder) BuildPackageFromScript(
 func (b *Builder) BuildPackage(
 	ctx context.Context,
 	input *BuildInput,
-) ([]*BuiltDep, error) {
+) (*BuildResult, error) {
 	scriptPath := input.script
 
 	slog.Debug("ReadScript")
 	sf, err := b.scriptExecutor.ReadScript(ctx, scriptPath)
 	if err != nil {
-		return nil, fmt.Errorf("failed reading script: %w", err)
+		return nil, err
 	}
 
 	slog.Debug("ExecuteFirstPass")
 	basePkg, varsOfPackages, err := b.scriptExecutor.ExecuteFirstPass(ctx, input, sf)
 	if err != nil {
-		return nil, fmt.Errorf("failed ExecuteFirstPass: %w", err)
+		return nil, err
 	}
 
-	var builtDeps []*BuiltDep
+	builtPaths := make([]string, 0)
 
 	if !input.opts.Clean {
-		var remainingVars []*alrsh.Package
+		var remainingVars []*types.BuildVars
 		for _, vars := range varsOfPackages {
 			builtPkgPath, ok, err := b.cacheExecutor.CheckForBuiltPackage(ctx, input, vars)
 			if err != nil {
 				return nil, err
 			}
 			if ok {
-				builtDeps = append(builtDeps, &BuiltDep{
+				builtPaths = append(builtPaths, builtPkgPath)
-					Path: builtPkgPath,
-				})
 			} else {
 				remainingVars = append(remainingVars, vars)
 			}
 		}
 
 		if len(remainingVars) == 0 {
-			return builtDeps, nil
+			return &BuildResult{builtPaths, nil}, nil
 		}
 	}
 
 	slog.Debug("ViewScript")
-	slog.Debug("", "varsOfPackages", varsOfPackages)
 	err = b.scriptViewerExecutor.ViewScript(ctx, input, sf, basePkg)
 	if err != nil {
 		return nil, err
@@ -391,11 +410,11 @@ func (b *Builder) BuildPackage(
 	sources := []string{}
 	checksums := []string{}
 	for _, vars := range varsOfPackages {
-		buildDepends = append(buildDepends, vars.BuildDepends.Resolved()...)
+		buildDepends = append(buildDepends, vars.BuildDepends...)
-		optDepends = append(optDepends, vars.OptDepends.Resolved()...)
+		optDepends = append(optDepends, vars.OptDepends...)
-		depends = append(depends, vars.Depends.Resolved()...)
+		depends = append(depends, vars.Depends...)
-		sources = append(sources, vars.Sources.Resolved()...)
+		sources = append(sources, vars.Sources...)
-		checksums = append(checksums, vars.Checksums.Resolved()...)
+		checksums = append(checksums, vars.Checksums...)
 	}
 	buildDepends = removeDuplicates(buildDepends)
 	optDepends = removeDuplicates(optDepends)
@@ -408,32 +427,19 @@ func (b *Builder) BuildPackage(
 	sources, checksums = removeDuplicatesSources(sources, checksums)
 
 	slog.Debug("installBuildDeps")
-	alrBuildDeps, err := b.installBuildDeps(ctx, input, buildDepends)
+	err = b.installBuildDeps(ctx, input, buildDepends)
 	if err != nil {
 		return nil, err
 	}
 
 	slog.Debug("installOptDeps")
-	_, err = b.installOptDeps(ctx, input, optDepends)
+	err = b.installOptDeps(ctx, input, optDepends)
 	if err != nil {
 		return nil, err
 	}
 
-	depNames := make(map[string]struct{})
-	for _, dep := range alrBuildDeps {
-		depNames[dep.Name] = struct{}{}
-	}
-
-	// We filter so as not to re-build what has already been built at the `installBuildDeps` stage.
-	var filteredDepends []string
-	for _, d := range depends {
-		if _, found := depNames[d]; !found {
-			filteredDepends = append(filteredDepends, d)
-		}
-	}
-
 	slog.Debug("BuildALRDeps")
-	newBuiltDeps, repoDeps, err := b.BuildALRDeps(ctx, input, filteredDepends)
+	builtPaths, builtNames, repoDeps, err := b.BuildALRDeps(ctx, input, depends)
 	if err != nil {
 		return nil, err
 	}
@@ -444,6 +450,8 @@ func (b *Builder) BuildPackage(
 		return nil, err
 	}
 
+	// builtPaths = append(builtPaths, newBuildPaths...)
+
 	slog.Info(gotext.Get("Downloading sources"))
 	slog.Debug("DownloadSources")
 	err = b.sourceExecutor.DownloadSources(
@@ -459,8 +467,6 @@ func (b *Builder) BuildPackage(
 		return nil, err
 	}
 
-	builtDeps = removeDuplicates(append(builtDeps, newBuiltDeps...))
-
 	slog.Debug("ExecuteSecondPass")
 	res, err := b.scriptExecutor.ExecuteSecondPass(
 		ctx,
@@ -468,21 +474,25 @@ func (b *Builder) BuildPackage(
 		sf,
 		varsOfPackages,
 		repoDeps,
-		builtDeps,
+		builtNames,
 		basePkg,
 	)
 	if err != nil {
 		return nil, err
 	}
 
-	builtDeps = removeDuplicates(append(builtDeps, res...))
+	pkgPaths := removeDuplicates(append(builtPaths, res.BuiltPaths...))
+	pkgNames := removeDuplicates(append(builtNames, res.BuiltNames...))
 
-	return builtDeps, nil
+	return &BuildResult{
+		PackagePaths: pkgPaths,
+		PackageNames: pkgNames,
+	}, nil
 }
 
 type InstallPkgsArgs struct {
 	BuildArgs
-	AlrPkgs    []alrsh.Package
+	AlrPkgs    []db.Package
 	NativePkgs []string
 }
 
@@ -493,7 +503,7 @@ func (b *Builder) InstallALRPackages(
 		BuildOptsProvider
 		PkgFormatProvider
 	},
-	alrPkgs []alrsh.Package,
+	alrPkgs []db.Package,
 ) error {
 	for _, pkg := range alrPkgs {
 		res, err := b.BuildPackageFromDb(
@@ -513,7 +523,7 @@ func (b *Builder) InstallALRPackages(
 		}
 
 		err = b.installerExecutor.InstallLocal(
-			GetBuiltPaths(res),
+			res.PackagePaths,
 			&manager.Opts{
 				NoConfirm: !input.BuildOpts().Interactive,
 			},
@@ -534,13 +544,13 @@ func (b *Builder) BuildALRDeps(
 		PkgFormatProvider
 	},
 	depends []string,
-) (buildDeps []*BuiltDep, repoDeps []string, err error) {
+) (builtPaths, builtNames, repoDeps []string, err error) {
 	if len(depends) > 0 {
 		slog.Info(gotext.Get("Installing dependencies"))
 
 		found, notFound, err := b.repos.FindPkgs(ctx, depends) // Поиск зависимостей
 		if err != nil {
-			return nil, nil, fmt.Errorf("failed FindPkgs: %w", err)
+			return nil, nil, nil, err
 		}
 		repoDeps = notFound
 
@@ -552,7 +562,7 @@ func (b *Builder) BuildALRDeps(
 			input.BuildOpts().Interactive,
 		)
 		type item struct {
-			pkg      *alrsh.Package
+			pkg      *db.Package
 			packages []string
 		}
 		pkgsMap := make(map[string]*item)
@@ -587,17 +597,20 @@ func (b *Builder) BuildALRDeps(
 				},
 			)
 			if err != nil {
-				return nil, nil, fmt.Errorf("failed build package from db: %w", err)
+				return nil, nil, nil, err
 			}
 
-			buildDeps = append(buildDeps, res...)
+			builtPaths = append(builtPaths, res.PackagePaths...)
+			builtNames = append(builtNames, res.PackageNames...)
 		}
 	}
 
+	// Удаляем возможные дубликаты, которые могут быть введены, если
+	// несколько зависимостей зависят от одних и тех же пакетов.
 	repoDeps = removeDuplicates(repoDeps)
-	buildDeps = removeDuplicates(buildDeps)
+	builtPaths = removeDuplicates(builtPaths)
-
+	builtNames = removeDuplicates(builtNames)
-	return buildDeps, repoDeps, nil
+	return builtPaths, builtNames, repoDeps, nil
 }
 
 func (i *Builder) installBuildDeps(
@@ -608,20 +621,19 @@ func (i *Builder) installBuildDeps(
 		PkgFormatProvider
 	},
 	pkgs []string,
-) ([]*BuiltDep, error) {
+) error {
-	var builtDeps []*BuiltDep
 	if len(pkgs) > 0 {
 		deps, err := i.installerExecutor.RemoveAlreadyInstalled(pkgs)
 		if err != nil {
-			return nil, err
+			return err
 		}
 
-		builtDeps, err = i.InstallPkgs(ctx, input, deps) // Устанавливаем выбранные пакеты
+		err = i.InstallPkgs(ctx, input, deps) // Устанавливаем выбранные пакеты
 		if err != nil {
-			return nil, err
+			return err
 		}
 	}
-	return builtDeps, nil
+	return nil
 }
 
 func (i *Builder) installOptDeps(
@@ -632,11 +644,10 @@ func (i *Builder) installOptDeps(
 		PkgFormatProvider
 	},
 	pkgs []string,
-) ([]*BuiltDep, error) {
+) error {
-	var builtDeps []*BuiltDep
 	optDeps, err := i.installerExecutor.RemoveAlreadyInstalled(pkgs)
 	if err != nil {
-		return nil, err
+		return err
 	}
 	if len(optDeps) > 0 {
 		optDeps, err := cliutils.ChooseOptDepends(
@@ -646,19 +657,19 @@ func (i *Builder) installOptDeps(
 			input.BuildOpts().Interactive,
 		) // Пользователя просят выбрать опциональные зависимости
 		if err != nil {
-			return nil, err
+			return err
 		}
 
 		if len(optDeps) == 0 {
-			return builtDeps, nil
+			return nil
 		}
 
-		builtDeps, err = i.InstallPkgs(ctx, input, optDeps) // Устанавливаем выбранные пакеты
+		err = i.InstallPkgs(ctx, input, optDeps) // Устанавливаем выбранные пакеты
 		if err != nil {
-			return nil, err
+			return err
 		}
 	}
-	return builtDeps, nil
+	return nil
 }
 
 func (i *Builder) InstallPkgs(
@@ -669,18 +680,18 @@ func (i *Builder) InstallPkgs(
 		PkgFormatProvider
 	},
 	pkgs []string,
-) ([]*BuiltDep, error) {
+) error {
-	builtDeps, repoDeps, err := i.BuildALRDeps(ctx, input, pkgs)
+	builtPaths, _, repoDeps, err := i.BuildALRDeps(ctx, input, pkgs)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	if len(builtDeps) > 0 {
+	if len(builtPaths) > 0 {
-		err = i.installerExecutor.InstallLocal(GetBuiltPaths(builtDeps), &manager.Opts{
+		err = i.installerExecutor.InstallLocal(builtPaths, &manager.Opts{
 			NoConfirm: !input.BuildOpts().Interactive,
 		})
 		if err != nil {
-			return nil, err
+			return err
 		}
 	}
 
@@ -689,9 +700,9 @@ func (i *Builder) InstallPkgs(
 			NoConfirm: !input.BuildOpts().Interactive,
 		})
 		if err != nil {
-			return nil, err
+			return err
 		}
 	}
 
-	return builtDeps, nil
+	return nil
 }

pkg/build/build_internal_test.need-to-update

@@ -28,9 +28,9 @@ 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/pkg/types"
+	"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/internal/manager"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 )
 
 type TestPackageFinder struct {

pkg/build/cache.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/goreleaser/nfpm/v2"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 )
 
 type Cache struct {
@@ -33,7 +33,7 @@ type Cache struct {
 func (c *Cache) CheckForBuiltPackage(
 	ctx context.Context,
 	input *BuildInput,
-	vars *alrsh.Package,
+	vars *types.BuildVars,
 ) (string, bool, error) {
 	filename, err := pkgFileName(input, vars)
 	if err != nil {
@@ -56,7 +56,7 @@ func pkgFileName(
 		PkgFormatProvider
 		RepositoryProvider
 	},
-	vars *alrsh.Package,
+	vars *types.BuildVars,
 ) (string, error) {
 	pkgInfo := getBasePkgInfo(vars, input)
 

pkg/build/checker.go

@@ -24,8 +24,8 @@ import (
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/manager"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 )
 
 type Checker struct {
@@ -35,7 +35,7 @@ type Checker struct {
 func (c *Checker) PerformChecks(
 	ctx context.Context,
 	input *BuildInput,
-	vars *alrsh.Package,
+	vars *types.BuildVars,
 ) (bool, error) {
 	if !cpu.IsCompatibleWith(cpu.Arch(), vars.Architectures) { // Проверяем совместимость архитектуры
 		cont, err := cliutils.YesNoPrompt(

pkg/build/dirs.go

@@ -19,7 +19,7 @@ package build
 import (
 	"path/filepath"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 )
 
 type BaseDirProvider interface {

pkg/build/find_deps/alt_linux.go

@@ -27,7 +27,7 @@ import (
 	"github.com/goreleaser/nfpm/v2"
 	"github.com/leonelquinteros/gotext"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 )
 
 func rpmFindDependenciesALTLinux(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Directories, command string, envs []string, updateFunc func(string)) error {

pkg/build/find_deps/empty.go

@@ -23,7 +23,7 @@ import (
 	"github.com/goreleaser/nfpm/v2"
 	"github.com/leonelquinteros/gotext"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 )
 
 type EmptyFindProvReq struct{}

pkg/build/find_deps/fedora.go

@@ -28,7 +28,7 @@ import (
 	"github.com/goreleaser/nfpm/v2"
 	"github.com/leonelquinteros/gotext"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 )
 
 type FedoraFindProvReq struct{}

pkg/build/find_deps/find_deps.go

@@ -21,8 +21,8 @@ import (
 
 	"github.com/goreleaser/nfpm/v2"
 
+	"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/types"
 )
 
 type ProvReqFinder interface {

pkg/build/installer.go

@@ -17,7 +17,7 @@
 package build
 
 import (
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/manager"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 )
 
 func NewInstaller(mgr manager.Manager) *Installer {

pkg/build/main_build.go

@@ -17,7 +17,7 @@
 package build
 
 import (
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/manager"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 )
 
 func NewMainBuilder(

pkg/build/safe_installer.go

@@ -28,7 +28,7 @@ import (
 	"github.com/hashicorp/go-plugin"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/logger"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/manager"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
 )
 
 type InstallerPlugin struct {

pkg/build/safe_script_executor.go

@@ -28,7 +28,7 @@ import (
 	"github.com/hashicorp/go-plugin"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/logger"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 )
 
 var HandshakeConfig = plugin.HandshakeConfig{
@@ -50,13 +50,13 @@ type ScriptExecutorRPCServer struct {
 // ReadScript
 //
 
-func (s *ScriptExecutorRPC) ReadScript(ctx context.Context, scriptPath string) (*alrsh.ScriptFile, error) {
+func (s *ScriptExecutorRPC) ReadScript(ctx context.Context, scriptPath string) (*ScriptFile, error) {
-	var resp *alrsh.ScriptFile
+	var resp *ScriptFile
 	err := s.client.Call("Plugin.ReadScript", scriptPath, &resp)
 	return resp, err
 }
 
-func (s *ScriptExecutorRPCServer) ReadScript(scriptPath string, resp *alrsh.ScriptFile) error {
+func (s *ScriptExecutorRPCServer) ReadScript(scriptPath string, resp *ScriptFile) error {
 	file, err := s.Impl.ReadScript(context.Background(), scriptPath)
 	if err != nil {
 		return err
@@ -72,15 +72,15 @@ func (s *ScriptExecutorRPCServer) ReadScript(scriptPath string, resp *alrsh.Scri
 
 type ExecuteFirstPassArgs struct {
 	Input *BuildInput
-	Sf    *alrsh.ScriptFile
+	Sf    *ScriptFile
 }
 
 type ExecuteFirstPassResp struct {
 	BasePkg        string
-	VarsOfPackages []*alrsh.Package
+	VarsOfPackages []*types.BuildVars
 }
 
-func (s *ScriptExecutorRPC) ExecuteFirstPass(ctx context.Context, input *BuildInput, sf *alrsh.ScriptFile) (string, []*alrsh.Package, error) {
+func (s *ScriptExecutorRPC) ExecuteFirstPass(ctx context.Context, input *BuildInput, sf *ScriptFile) (string, []*types.BuildVars, error) {
 	var resp *ExecuteFirstPassResp
 	err := s.client.Call("Plugin.ExecuteFirstPass", &ExecuteFirstPassArgs{
 		Input: input,
@@ -148,29 +148,29 @@ func (s *ScriptExecutorRPCServer) PrepareDirs(args *PrepareDirsArgs, reply *stru
 
 type ExecuteSecondPassArgs struct {
 	Input          *BuildInput
-	Sf             *alrsh.ScriptFile
+	Sf             *ScriptFile
-	VarsOfPackages []*alrsh.Package
+	VarsOfPackages []*types.BuildVars
 	RepoDeps       []string
-	BuiltDeps      []*BuiltDep
+	BuiltNames     []string
 	BasePkg        string
 }
 
 func (s *ScriptExecutorRPC) ExecuteSecondPass(
 	ctx context.Context,
 	input *BuildInput,
-	sf *alrsh.ScriptFile,
+	sf *ScriptFile,
-	varsOfPackages []*alrsh.Package,
+	varsOfPackages []*types.BuildVars,
 	repoDeps []string,
-	builtDeps []*BuiltDep,
+	builtNames []string,
 	basePkg string,
-) ([]*BuiltDep, error) {
+) (*SecondPassResult, error) {
-	var resp []*BuiltDep
+	var resp *SecondPassResult
 	err := s.client.Call("Plugin.ExecuteSecondPass", &ExecuteSecondPassArgs{
 		Input:          input,
 		Sf:             sf,
 		VarsOfPackages: varsOfPackages,
 		RepoDeps:       repoDeps,
-		BuiltDeps:      builtDeps,
+		BuiltNames:     builtNames,
 		BasePkg:        basePkg,
 	}, &resp)
 	if err != nil {
@@ -179,20 +179,20 @@ func (s *ScriptExecutorRPC) ExecuteSecondPass(
 	return resp, nil
 }
 
-func (s *ScriptExecutorRPCServer) ExecuteSecondPass(args *ExecuteSecondPassArgs, resp *[]*BuiltDep) error {
+func (s *ScriptExecutorRPCServer) ExecuteSecondPass(args *ExecuteSecondPassArgs, resp *SecondPassResult) error {
 	res, err := s.Impl.ExecuteSecondPass(
 		context.Background(),
 		args.Input,
 		args.Sf,
 		args.VarsOfPackages,
 		args.RepoDeps,
-		args.BuiltDeps,
+		args.BuiltNames,
 		args.BasePkg,
 	)
 	if err != nil {
 		return err
 	}
-	*resp = res
+	*resp = *res
 	return err
 }
 

pkg/build/script_executor.go

@@ -19,6 +19,7 @@ package build
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"log/slog"
 	"os"
@@ -35,12 +36,12 @@ import (
 	"mvdan.cc/sh/v3/interp"
 	"mvdan.cc/sh/v3/syntax"
 
-	finddeps "gitea.plemya-x.ru/Plemya-x/ALR/internal/build/find_deps"
 	"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/shutils/helpers"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
+	finddeps "gitea.plemya-x.ru/Plemya-x/ALR/pkg/build/find_deps"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
 )
 
 type LocalScriptExecutor struct {
@@ -53,12 +54,107 @@ func NewLocalScriptExecutor(cfg Config) *LocalScriptExecutor {
 	}
 }
 
-func (e *LocalScriptExecutor) ReadScript(ctx context.Context, scriptPath string) (*alrsh.ScriptFile, error) {
+func (e *LocalScriptExecutor) ReadScript(ctx context.Context, scriptPath string) (*ScriptFile, error) {
-	return alrsh.ReadFromLocal(scriptPath)
+	fl, err := readScript(scriptPath)
+	if err != nil {
+		return nil, err
+	}
+	return &ScriptFile{
+		Path: scriptPath,
+		File: fl,
+	}, nil
 }
 
-func (e *LocalScriptExecutor) ExecuteFirstPass(ctx context.Context, input *BuildInput, sf *alrsh.ScriptFile) (string, []*alrsh.Package, error) {
+func (e *LocalScriptExecutor) ExecuteFirstPass(ctx context.Context, input *BuildInput, sf *ScriptFile) (string, []*types.BuildVars, error) {
-	return sf.ParseBuildVars(ctx, input.info, input.packages)
+	varsOfPackages := []*types.BuildVars{}
+
+	scriptDir := filepath.Dir(sf.Path)
+	env := createBuildEnvVars(input.info, types.Directories{ScriptDir: scriptDir})
+
+	runner, err := interp.New(
+		interp.Env(expand.ListEnviron(env...)),                               // Устанавливаем окружение
+		interp.StdIO(os.Stdin, os.Stderr, os.Stderr),                         // Устанавливаем стандартный ввод-вывод
+		interp.ExecHandler(helpers.Restricted.ExecHandler(handlers.NopExec)), // Ограничиваем выполнение
+		interp.ReadDirHandler2(handlers.RestrictedReadDir(scriptDir)),        // Ограничиваем чтение директорий
+		interp.StatHandler(handlers.RestrictedStat(scriptDir)),               // Ограничиваем доступ к статистике файлов
+		interp.OpenHandler(handlers.RestrictedOpen(scriptDir)),               // Ограничиваем открытие файлов
+		interp.Dir(scriptDir),
+	)
+	if err != nil {
+		return "", nil, err
+	}
+
+	err = runner.Run(ctx, sf.File) // Запускаем скрипт
+	if err != nil {
+		return "", nil, err
+	}
+
+	dec := decoder.New(input.info, runner) // Создаём новый декодер
+
+	type packages struct {
+		BasePkgName string   `sh:"basepkg_name"`
+		Names       []string `sh:"name"`
+	}
+
+	var pkgs packages
+	err = dec.DecodeVars(&pkgs)
+	if err != nil {
+		return "", nil, err
+	}
+
+	if len(pkgs.Names) == 0 {
+		return "", nil, errors.New("package name is missing")
+	}
+
+	var vars types.BuildVars
+
+	if len(pkgs.Names) == 1 {
+		err = dec.DecodeVars(&vars) // Декодируем переменные
+		if err != nil {
+			return "", nil, err
+		}
+		varsOfPackages = append(varsOfPackages, &vars)
+
+		return vars.Name, varsOfPackages, nil
+	}
+
+	var pkgNames []string
+
+	if len(input.packages) != 0 {
+		pkgNames = input.packages
+	} else {
+		pkgNames = pkgs.Names
+	}
+
+	for _, pkgName := range pkgNames {
+		var preVars types.BuildVarsPre
+		funcName := fmt.Sprintf("meta_%s", pkgName)
+		meta, ok := dec.GetFuncWithSubshell(funcName)
+		if !ok {
+			return "", nil, fmt.Errorf("func %s is missing", funcName)
+		}
+		r, err := meta(ctx)
+		if err != nil {
+			return "", nil, err
+		}
+		d := decoder.New(&distro.OSRelease{}, r)
+		err = d.DecodeVars(&preVars)
+		if err != nil {
+			return "", nil, err
+		}
+		vars := preVars.ToBuildVars()
+		vars.Name = pkgName
+		vars.Base = pkgs.BasePkgName
+
+		varsOfPackages = append(varsOfPackages, &vars)
+	}
+
+	return pkgs.BasePkgName, varsOfPackages, nil
+}
+
+type SecondPassResult struct {
+	BuiltPaths []string
+	BuiltNames []string
 }
 
 func (e *LocalScriptExecutor) PrepareDirs(
@@ -86,13 +182,13 @@ func (e *LocalScriptExecutor) PrepareDirs(
 func (e *LocalScriptExecutor) ExecuteSecondPass(
 	ctx context.Context,
 	input *BuildInput,
-	sf *alrsh.ScriptFile,
+	sf *ScriptFile,
-	varsOfPackages []*alrsh.Package,
+	varsOfPackages []*types.BuildVars,
 	repoDeps []string,
-	builtDeps []*BuiltDep,
+	builtNames []string,
 	basePkg string,
-) ([]*BuiltDep, error) {
+) (*SecondPassResult, error) {
-	dirs, err := getDirs(e.cfg, sf.Path(), basePkg)
+	dirs, err := getDirs(e.cfg, sf.Path, basePkg)
 	if err != nil {
 		return nil, err
 	}
@@ -110,14 +206,14 @@ func (e *LocalScriptExecutor) ExecuteSecondPass(
 		return nil, err
 	}
 
-	err = runner.Run(ctx, sf.File())
+	err = runner.Run(ctx, sf.File)
 	if err != nil {
 		return nil, err
 	}
 
 	dec := decoder.New(input.info, runner)
 
-	// var builtPaths []string
+	var builtPaths []string
 
 	err = e.ExecuteFunctions(ctx, dirs, dec)
 	if err != nil {
@@ -126,7 +222,7 @@ func (e *LocalScriptExecutor) ExecuteSecondPass(
 
 	for _, vars := range varsOfPackages {
 		packageName := ""
-		if vars.BasePkgName != "" {
+		if vars.Base != "" {
 			packageName = vars.Name
 		}
 
@@ -151,7 +247,7 @@ func (e *LocalScriptExecutor) ExecuteSecondPass(
 			dirs,
 			append(
 				repoDeps,
-				GetBuiltName(builtDeps)...,
+				builtNames...,
 			),
 			funcOut.Contents,
 		)
@@ -177,13 +273,14 @@ func (e *LocalScriptExecutor) ExecuteSecondPass(
 			return nil, err
 		}
 
-		builtDeps = append(builtDeps, &BuiltDep{
+		builtPaths = append(builtPaths, pkgPath)
-			Name: vars.Name,
+		builtNames = append(builtNames, vars.Name)
-			Path: pkgPath,
-		})
 	}
 
-	return builtDeps, nil
+	return &SecondPassResult{
+		BuiltPaths: builtPaths,
+		BuiltNames: builtNames,
+	}, nil
 }
 
 func buildPkgMetadata(
@@ -194,24 +291,24 @@ func buildPkgMetadata(
 		PkgFormatProvider
 		RepositoryProvider
 	},
-	vars *alrsh.Package,
+	vars *types.BuildVars,
 	dirs types.Directories,
 	deps []string,
 	preferedContents *[]string,
 ) (*nfpm.Info, error) {
 	pkgInfo := getBasePkgInfo(vars, input)
-	pkgInfo.Description = vars.Description.Resolved()
+	pkgInfo.Description = vars.Description
 	pkgInfo.Platform = "linux"
-	pkgInfo.Homepage = vars.Homepage.Resolved()
+	pkgInfo.Homepage = vars.Homepage
 	pkgInfo.License = strings.Join(vars.Licenses, ", ")
-	pkgInfo.Maintainer = vars.Maintainer.Resolved()
+	pkgInfo.Maintainer = vars.Maintainer
 	pkgInfo.Overridables = nfpm.Overridables{
 		Conflicts: append(vars.Conflicts, vars.Name),
 		Replaces:  vars.Replaces,
 		Provides:  append(vars.Provides, vars.Name),
 		Depends:   deps,
 	}
-	pkgInfo.Section = vars.Group.Resolved()
+	pkgInfo.Section = vars.Group
 
 	pkgFormat := input.PkgFormat()
 	info := input.OSRelease()
@@ -224,12 +321,12 @@ func buildPkgMetadata(
 	}
 
 	if pkgFormat == "rpm" {
-		pkgInfo.RPM.Group = vars.Group.Resolved()
+		pkgInfo.RPM.Group = vars.Group
 
-		if vars.Summary.Resolved() != "" {
+		if vars.Summary != "" {
-			pkgInfo.RPM.Summary = vars.Summary.Resolved()
+			pkgInfo.RPM.Summary = vars.Summary
 		} else {
-			lines := strings.SplitN(vars.Description.Resolved(), "\n", 2)
+			lines := strings.SplitN(vars.Description, "\n", 2)
 			pkgInfo.RPM.Summary = lines[0]
 		}
 	}
@@ -248,29 +345,19 @@ func buildPkgMetadata(
 	if err != nil {
 		return nil, err
 	}
-
-	normalizeContents(contents)
-
-	if vars.FireJailed.Resolved() {
-		contents, err = applyFirejailIntegration(vars, dirs, contents)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	pkgInfo.Overridables.Contents = contents
 
-	if len(vars.AutoProv.Resolved()) == 1 && decoder.IsTruthy(vars.AutoProv.Resolved()[0]) {
+	if len(vars.AutoProv) == 1 && decoder.IsTruthy(vars.AutoProv[0]) {
 		f := finddeps.New(info, pkgFormat)
-		err = f.FindProvides(ctx, pkgInfo, dirs, vars.AutoProvSkipList.Resolved())
+		err = f.FindProvides(ctx, pkgInfo, dirs, vars.AutoProvSkipList)
 		if err != nil {
 			return nil, err
 		}
 	}
 
-	if len(vars.AutoReq.Resolved()) == 1 && decoder.IsTruthy(vars.AutoReq.Resolved()[0]) {
+	if len(vars.AutoReq) == 1 && decoder.IsTruthy(vars.AutoReq[0]) {
 		f := finddeps.New(info, pkgFormat)
-		err = f.FindRequires(ctx, pkgInfo, dirs, vars.AutoReqSkipList.Resolved())
+		err = f.FindRequires(ctx, pkgInfo, dirs, vars.AutoReqSkipList)
 		if err != nil {
 			return nil, err
 		}

pkg/build/script_resolver.go

@@ -18,10 +18,9 @@ package build
 
 import (
 	"context"
-	"os"
 	"path/filepath"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 )
 
 type ScriptResolver struct {
@@ -35,27 +34,16 @@ type ScriptInfo struct {
 
 func (s *ScriptResolver) ResolveScript(
 	ctx context.Context,
-	pkg *alrsh.Package,
+	pkg *db.Package,
 ) *ScriptInfo {
 	var repository, script string
 
 	repodir := s.cfg.GetPaths().RepoDir
 	repository = pkg.Repository
-
-	// First, we check if there is a root alr.sh in the repository
-	rootScriptPath := filepath.Join(repodir, repository, "alr.sh")
-	if _, err := os.Stat(rootScriptPath); err == nil {
-		// A repository with a single alr.sh at the root
-		script = rootScriptPath
-	} else {
-		// Multi-package repository - we are looking for alr.sh in the subfolder
-		var scriptPath string
 	if pkg.BasePkgName != "" {
-			scriptPath = filepath.Join(repodir, repository, pkg.BasePkgName, "alr.sh")
+		script = filepath.Join(repodir, repository, pkg.BasePkgName, "alr.sh")
 	} else {
-			scriptPath = filepath.Join(repodir, repository, pkg.Name, "alr.sh")
+		script = filepath.Join(repodir, repository, pkg.Name, "alr.sh")
-		}
-		script = scriptPath
 	}
 
 	return &ScriptInfo{

pkg/build/script_view.go

@@ -20,7 +20,6 @@ import (
 	"context"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
 )
 
 type ScriptViewerConfig interface {
@@ -34,12 +33,12 @@ type ScriptViewer struct {
 func (s *ScriptViewer) ViewScript(
 	ctx context.Context,
 	input *BuildInput,
-	a *alrsh.ScriptFile,
+	sf *ScriptFile,
 	basePkg string,
 ) error {
 	return cliutils.PromptViewScript(
 		ctx,
-		a.Path(),
+		sf.Path,
 		basePkg,
 		s.config.PagerStyle(),
 		input.opts.Interactive,

pkg/build/utils.go

@@ -33,18 +33,34 @@ import (
 	_ "github.com/goreleaser/nfpm/v2/arch"
 	_ "github.com/goreleaser/nfpm/v2/deb"
 	_ "github.com/goreleaser/nfpm/v2/rpm"
+	"mvdan.cc/sh/v3/syntax"
 
 	"github.com/goreleaser/nfpm/v2"
 	"github.com/goreleaser/nfpm/v2/files"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/manager"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
+	"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/types"
+	"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) // Удаляем базовую директорию, если она существует
@@ -60,7 +76,7 @@ func prepareDirs(dirs types.Directories) error {
 
 // Функция buildContents создает секцию содержимого пакета, которая содержит файлы,
 // которые будут включены в конечный пакет.
-func buildContents(vars *alrsh.Package, dirs types.Directories, preferedContents *[]string) ([]*files.Content, error) {
+func buildContents(vars *types.BuildVars, dirs types.Directories, preferedContents *[]string) ([]*files.Content, error) {
 	contents := []*files.Content{}
 
 	processPath := func(path, trimmed string, prefered bool) error {
@@ -123,7 +139,7 @@ func buildContents(vars *alrsh.Package, dirs types.Directories, preferedContents
 			},
 		}
 
-		if slices.Contains(vars.Backup.Resolved(), trimmed) {
+		if slices.Contains(vars.Backup, trimmed) {
 			fileContent.Type = "config|noreplace"
 		}
 
@@ -154,15 +170,9 @@ func buildContents(vars *alrsh.Package, dirs types.Directories, preferedContents
 	return contents, nil
 }
 
-func normalizeContents(contents []*files.Content) {
-	for _, content := range contents {
-		content.Destination = filepath.Join("/", content.Destination)
-	}
-}
-
 var RegexpALRPackageName = regexp.MustCompile(`^(?P<package>[^+]+)\+alr-(?P<repo>.+)$`)
 
-func getBasePkgInfo(vars *alrsh.Package, input interface {
+func getBasePkgInfo(vars *types.BuildVars, input interface {
 	RepositoryProvider
 	OsInfoProvider
 },
@@ -218,39 +228,39 @@ func createBuildEnvVars(info *distro.OSRelease, dirs types.Directories) []string
 }
 
 // Функция setScripts добавляет скрипты-перехватчики к метаданным пакета.
-func setScripts(vars *alrsh.Package, info *nfpm.Info, scriptDir string) {
+func setScripts(vars *types.BuildVars, info *nfpm.Info, scriptDir string) {
-	if vars.Scripts.Resolved().PreInstall != "" {
+	if vars.Scripts.PreInstall != "" {
-		info.Scripts.PreInstall = filepath.Join(scriptDir, vars.Scripts.Resolved().PreInstall)
+		info.Scripts.PreInstall = filepath.Join(scriptDir, vars.Scripts.PreInstall)
 	}
 
-	if vars.Scripts.Resolved().PostInstall != "" {
+	if vars.Scripts.PostInstall != "" {
-		info.Scripts.PostInstall = filepath.Join(scriptDir, vars.Scripts.Resolved().PostInstall)
+		info.Scripts.PostInstall = filepath.Join(scriptDir, vars.Scripts.PostInstall)
 	}
 
-	if vars.Scripts.Resolved().PreRemove != "" {
+	if vars.Scripts.PreRemove != "" {
-		info.Scripts.PreRemove = filepath.Join(scriptDir, vars.Scripts.Resolved().PreRemove)
+		info.Scripts.PreRemove = filepath.Join(scriptDir, vars.Scripts.PreRemove)
 	}
 
-	if vars.Scripts.Resolved().PostRemove != "" {
+	if vars.Scripts.PostRemove != "" {
-		info.Scripts.PostRemove = filepath.Join(scriptDir, vars.Scripts.Resolved().PostRemove)
+		info.Scripts.PostRemove = filepath.Join(scriptDir, vars.Scripts.PostRemove)
 	}
 
-	if vars.Scripts.Resolved().PreUpgrade != "" {
+	if vars.Scripts.PreUpgrade != "" {
-		info.ArchLinux.Scripts.PreUpgrade = filepath.Join(scriptDir, vars.Scripts.Resolved().PreUpgrade)
+		info.ArchLinux.Scripts.PreUpgrade = filepath.Join(scriptDir, vars.Scripts.PreUpgrade)
-		info.APK.Scripts.PreUpgrade = filepath.Join(scriptDir, vars.Scripts.Resolved().PreUpgrade)
+		info.APK.Scripts.PreUpgrade = filepath.Join(scriptDir, vars.Scripts.PreUpgrade)
 	}
 
-	if vars.Scripts.Resolved().PostUpgrade != "" {
+	if vars.Scripts.PostUpgrade != "" {
-		info.ArchLinux.Scripts.PostUpgrade = filepath.Join(scriptDir, vars.Scripts.Resolved().PostUpgrade)
+		info.ArchLinux.Scripts.PostUpgrade = filepath.Join(scriptDir, vars.Scripts.PostUpgrade)
-		info.APK.Scripts.PostUpgrade = filepath.Join(scriptDir, vars.Scripts.Resolved().PostUpgrade)
+		info.APK.Scripts.PostUpgrade = filepath.Join(scriptDir, vars.Scripts.PostUpgrade)
 	}
 
-	if vars.Scripts.Resolved().PreTrans != "" {
+	if vars.Scripts.PreTrans != "" {
-		info.RPM.Scripts.PreTrans = filepath.Join(scriptDir, vars.Scripts.Resolved().PreTrans)
+		info.RPM.Scripts.PreTrans = filepath.Join(scriptDir, vars.Scripts.PreTrans)
 	}
 
-	if vars.Scripts.Resolved().PostTrans != "" {
+	if vars.Scripts.PostTrans != "" {
-		info.RPM.Scripts.PostTrans = filepath.Join(scriptDir, vars.Scripts.Resolved().PostTrans)
+		info.RPM.Scripts.PostTrans = filepath.Join(scriptDir, vars.Scripts.PostTrans)
 	}
 }
 
@@ -278,14 +288,14 @@ func packageNames(pkgs []db.Package) []string {
 */
 
 // Функция removeDuplicates убирает любые дубликаты из предоставленного среза.
-func removeDuplicates[T comparable](slice []T) []T {
+func removeDuplicates(slice []string) []string {
-	seen := map[T]struct{}{}
+	seen := map[string]struct{}{}
-	result := []T{}
+	result := []string{}
 
-	for _, item := range slice {
+	for _, s := range slice {
-		if _, ok := seen[item]; !ok {
+		if _, ok := seen[s]; !ok {
-			seen[item] = struct{}{}
+			seen[s] = struct{}{}
-			result = append(result, item)
+			result = append(result, s)
 		}
 	}
 

pkg/manager/apt_rpm.go

@@ -67,7 +67,7 @@ func (a *APTRpm) Sync(opts *Opts) error {
 
 func (a *APTRpm) Install(opts *Opts, pkgs ...string) error {
 	opts = ensureOpts(opts)
-	cmd := a.getCmd(opts, "apt-get", "install", "-o", "APT::Install::Virtual=true")
+	cmd := a.getCmd(opts, "apt-get", "install")
 	cmd.Args = append(cmd.Args, pkgs...)
 	setCmdEnv(cmd)
 	cmd.Stdout = cmd.Stderr

pkg/repos/find.go

@@ -22,11 +22,11 @@ package repos
 import (
 	"context"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 )
 
-func (rs *Repos) FindPkgs(ctx context.Context, pkgs []string) (map[string][]alrsh.Package, []string, error) {
+func (rs *Repos) FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error) {
-	found := map[string][]alrsh.Package{}
+	found := map[string][]db.Package{}
 	notFound := []string(nil)
 
 	for _, pkgName := range pkgs {
@@ -40,10 +40,17 @@ func (rs *Repos) FindPkgs(ctx context.Context, pkgs []string) (map[string][]alrs
 		}
 
 		added := 0
-		for _, pkg := range result {
+		for result.Next() {
+			var pkg db.Package
+			err = result.StructScan(&pkg)
+			if err != nil {
+				return nil, nil, err
+			}
+
 			added++
 			found[pkgName] = append(found[pkgName], pkg)
 		}
+		result.Close()
 
 		if added == 0 {
 			result, err := rs.db.GetPkgs(ctx, "name LIKE ?", pkgName)
@@ -51,10 +58,18 @@ func (rs *Repos) FindPkgs(ctx context.Context, pkgs []string) (map[string][]alrs
 				return nil, nil, err
 			}
 
-			for _, pkg := range result {
+			for result.Next() {
+				var pkg db.Package
+				err = result.StructScan(&pkg)
+				if err != nil {
+					return nil, nil, err
+				}
+
 				added++
 				found[pkgName] = append(found[pkgName], pkg)
 			}
+
+			result.Close()
 		}
 
 		if added == 0 {

pkg/repos/find_test.go

@@ -24,9 +24,9 @@ import (
 	"strings"
 	"testing"
 
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/repos"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
+	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
 )
 
 func TestFindPkgs(t *testing.T) {
@@ -41,7 +41,7 @@ func TestFindPkgs(t *testing.T) {
 	err := rs.Pull(e.Ctx, []types.Repo{
 		{
 			Name: "default",
-			URL:  "https://gitea.plemya-x.ru/Plemya-x/alr-default.git",
+			URL:  "https://gitea.plemya-x.ru/xpamych/xpamych-alr-repo.git",
 		},
 	})
 	if err != nil {
@@ -89,31 +89,31 @@ func TestFindPkgsEmpty(t *testing.T) {
 		e.Db,
 	)
 
-	err := e.Db.InsertPackage(e.Ctx, alrsh.Package{
+	err := e.Db.InsertPackage(e.Ctx, db.Package{
 		Name:       "test1",
 		Repository: "default",
 		Version:    "0.0.1",
 		Release:    1,
-		Provides:   []string{""},
+		Description: db.NewJSON(map[string]string{
-		Description: alrsh.OverridableFromMap(map[string]string{
 			"en": "Test package 1",
 			"ru": "Проверочный пакет 1",
 		}),
+		Provides: db.NewJSON([]string{""}),
 	})
 	if err != nil {
 		t.Fatalf("Expected no error, got %s", err)
 	}
 
-	err = e.Db.InsertPackage(e.Ctx, alrsh.Package{
+	err = e.Db.InsertPackage(e.Ctx, db.Package{
 		Name:       "test2",
 		Repository: "default",
 		Version:    "0.0.1",
 		Release:    1,
-		Provides:   []string{"test"},
+		Description: db.NewJSON(map[string]string{
-		Description: alrsh.OverridableFromMap(map[string]string{
 			"en": "Test package 2",
 			"ru": "Проверочный пакет 2",
 		}),
+		Provides: db.NewJSON([]string{"test"}),
 	})
 	if err != nil {
 		t.Fatalf("Expected no error, got %s", err)

pkg/repos/pull.go

@@ -44,7 +44,7 @@ import (
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
-	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/types"
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
 )
 
 type actionType uint8
@@ -130,7 +130,7 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error {
 			// If the DB was not present at startup, that means it's
 			// empty. In this case, we need to update the DB fully
 			// rather than just incrementally.
-			if rs.db.IsEmpty() {
+			if rs.db.IsEmpty(ctx) {
 				err = rs.processRepoFull(ctx, repo, repoDir)
 				if err != nil {
 					return err
@@ -277,15 +277,7 @@ func (rs *Repos) processRepoChanges(ctx context.Context, repo types.Repo, r *git
 	for _, fp := range patch.FilePatches() {
 		from, to := fp.Files()
 
-		var isValidPath bool
+		if !isValid(from, to) {
-		if from != nil {
-			isValidPath = isValidScriptPath(from.Path())
-		}
-		if to != nil {
-			isValidPath = isValidPath || isValidScriptPath(to.Path())
-		}
-
-		if !isValidPath {
 			continue
 		}
 
@@ -324,60 +316,55 @@ func (rs *Repos) processRepoChanges(ctx context.Context, repo types.Repo, r *git
 	parser := syntax.NewParser()
 
 	for _, action := range actions {
-		var scriptDir string
+		runner, err := rs.processRepoChangesRunner(repoDir, filepath.Dir(filepath.Join(repoDir, action.File)))
-		if filepath.Dir(action.File) == "." {
-			scriptDir = repoDir
-		} else {
-			scriptDir = filepath.Dir(filepath.Join(repoDir, action.File))
-		}
-
-		runner, err := rs.processRepoChangesRunner(repoDir, scriptDir)
 		if err != nil {
 			return fmt.Errorf("error creating process repo changes runner: %w", err)
 		}
 
 		switch action.Type {
 		case actionDelete:
+			if filepath.Base(action.File) != "alr.sh" {
+				continue
+			}
 			scriptFl, err := oldCommit.File(action.File)
 			if err != nil {
-				slog.Warn("Failed to get deleted file from old commit", "file", action.File, "error", err)
+				return nil
-				continue
 			}
 
 			r, err := scriptFl.Reader()
 			if err != nil {
-				slog.Warn("Failed to read deleted file", "file", action.File, "error", err)
+				return nil
-				continue
 			}
 
 			pkgs, err := parseScript(ctx, repo, parser, runner, r)
 			if err != nil {
-				return fmt.Errorf("error parsing deleted script %s: %w", action.File, err)
+				return err
 			}
 
 			for _, pkg := range pkgs {
 				err = rs.db.DeletePkgs(ctx, "name = ? AND repository = ?", pkg.Name, repo.Name)
 				if err != nil {
-					return fmt.Errorf("error deleting package %s: %w", pkg.Name, err)
+					return err
 				}
 			}
+		case actionUpdate:
+			if filepath.Base(action.File) != "alr.sh" {
+				action.File = filepath.Join(filepath.Dir(action.File), "alr.sh")
+			}
 
-		case actionUpdate:
 			scriptFl, err := newCommit.File(action.File)
 			if err != nil {
-				slog.Warn("Failed to get updated file from new commit", "file", action.File, "error", err)
+				return nil
-				continue
 			}
 
 			r, err := scriptFl.Reader()
 			if err != nil {
-				slog.Warn("Failed to read updated file", "file", action.File, "error", err)
+				return nil
-				continue
 			}
 
 			err = rs.updatePkg(ctx, repo, runner, r)
 			if err != nil {
-				return fmt.Errorf("error updating package from %s: %w", action.File, err)
+				return fmt.Errorf("error updatePkg: %w", err)
 			}
 		}
 	}
@@ -385,68 +372,27 @@ func (rs *Repos) processRepoChanges(ctx context.Context, repo types.Repo, r *git
 	return nil
 }
 
-func isValidScriptPath(path string) bool {
-	if filepath.Base(path) != "alr.sh" {
-		return false
-	}
-
-	dir := filepath.Dir(path)
-	return dir == "." || !strings.Contains(strings.TrimPrefix(dir, "./"), "/")
-}
-
 func (rs *Repos) processRepoFull(ctx context.Context, repo types.Repo, repoDir string) error {
-	rootScript := filepath.Join(repoDir, "alr.sh")
+	glob := filepath.Join(repoDir, "/*/alr.sh")
-	if fi, err := os.Stat(rootScript); err == nil && !fi.IsDir() {
-		slog.Debug("Found root alr.sh, processing single-script repository", "repo", repo.Name)
-
-		runner, err := rs.processRepoChangesRunner(repoDir, repoDir)
-		if err != nil {
-			return fmt.Errorf("error creating runner for root alr.sh: %w", err)
-		}
-
-		scriptFl, err := os.Open(rootScript)
-		if err != nil {
-			return fmt.Errorf("error opening root alr.sh: %w", err)
-		}
-		defer scriptFl.Close()
-
-		err = rs.updatePkg(ctx, repo, runner, scriptFl)
-		if err != nil {
-			return fmt.Errorf("error processing root alr.sh: %w", err)
-		}
-
-		return nil
-	}
-
-	glob := filepath.Join(repoDir, "*/alr.sh")
 	matches, err := filepath.Glob(glob)
 	if err != nil {
-		return fmt.Errorf("error globbing for alr.sh files: %w", err)
+		return err
 	}
 
-	if len(matches) == 0 {
-		slog.Warn("No alr.sh files found in repository", "repo", repo.Name)
-		return nil
-	}
-
-	slog.Debug("Found multiple alr.sh files, processing multi-package repository",
-		"repo", repo.Name, "count", len(matches))
-
 	for _, match := range matches {
 		runner, err := rs.processRepoChangesRunner(repoDir, filepath.Dir(match))
 		if err != nil {
-			return fmt.Errorf("error creating runner for %s: %w", match, err)
+			return err
 		}
 
 		scriptFl, err := os.Open(match)
 		if err != nil {
-			return fmt.Errorf("error opening %s: %w", match, err)
+			return err
 		}
 
 		err = rs.updatePkg(ctx, repo, runner, scriptFl)
-		scriptFl.Close()
 		if err != nil {
-			return fmt.Errorf("error processing %s: %w", match, err)
+			return err
 		}
 	}