forked from Plemya-x/ALR
Compare commits
45 Commits
chore/add-
...
master
Author | SHA1 | Date | |
---|---|---|---|
99857efb01 | |||
19bb87981c | |||
1c78adcca1 | |||
a98bd44305 | |||
|
3deb6c9455 | ||
|
981f49587b | ||
|
35656d63a1 | ||
6410f7547b | |||
53e783df31 | |||
fcc9ef5474 | |||
|
f6ba4a1c26 | ||
b5bf6ab61d | |||
|
18e90e4afc | ||
a09863dfcb | |||
|
fd643ea6cd | ||
|
309ecf784f | ||
|
30f95a4cbf | ||
|
b9bf908007 | ||
|
a6076b1253 | ||
|
ac35b4d71d | ||
945f920654 | |||
|
84ac2377fb | ||
de1db25202 | |||
|
2d6504b329 | ||
4ca557402a | |||
|
e497d41030 | ||
|
d46414a67c | ||
29e2f85eeb | |||
c9c872abbc | |||
fb93864d09 | |||
9fcd618a83 | |||
1fb9c6b574 | |||
fb5c875713 | |||
|
3f428ab7b5 | ||
|
5b7af1f6b5 | ||
|
3224d7c6e4 | ||
|
e1829c4824 | ||
|
12d83f2015 | ||
|
6bc6bfdcd9 | ||
|
eeb25c239b | ||
|
91937a1fc5 | ||
|
e827fb8049 | ||
|
a13acc5ed0 | ||
|
52d3ab7791 | ||
|
a345a24b95 |
@ -1,9 +1,25 @@
|
|||||||
|
# ALR - Any Linux Repository
|
||||||
|
# Copyright (C) 2025 Евгений Храмов
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
run:
|
run:
|
||||||
timeout: 5m
|
timeout: 5m
|
||||||
|
|
||||||
linters-settings:
|
linters-settings:
|
||||||
goimports:
|
goimports:
|
||||||
local-prefixes: "plemya-x.ru/alr"
|
local-prefixes: "gitea.plemya-x.ru/Plemya-x/ALR"
|
||||||
gofmt:
|
gofmt:
|
||||||
simplify: true
|
simplify: true
|
||||||
gofumpt:
|
gofumpt:
|
||||||
@ -20,7 +36,11 @@ linters:
|
|||||||
- unused
|
- unused
|
||||||
- errcheck
|
- errcheck
|
||||||
- typecheck
|
- typecheck
|
||||||
# - forbidigo
|
# - forbidigo
|
||||||
|
|
||||||
issues:
|
issues:
|
||||||
fix: true
|
fix: true
|
||||||
|
exclude-rules:
|
||||||
|
- path: _test\.go
|
||||||
|
linters:
|
||||||
|
- errcheck
|
@ -1,3 +1,22 @@
|
|||||||
|
# This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
|
# It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
|
#
|
||||||
|
# ALR - Any Linux Repository
|
||||||
|
# Copyright (C) 2025 Евгений Храмов
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
before:
|
before:
|
||||||
hooks:
|
hooks:
|
||||||
- go mod tidy
|
- go mod tidy
|
||||||
|
@ -1,3 +1,22 @@
|
|||||||
|
# This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
|
# It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
|
#
|
||||||
|
# ALR - Any Linux Repository
|
||||||
|
# Copyright (C) 2025 Евгений Храмов
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
platform: linux/amd64
|
platform: linux/amd64
|
||||||
pipeline:
|
pipeline:
|
||||||
release:
|
release:
|
||||||
|
22
Makefile
22
Makefile
@ -11,7 +11,9 @@ ZSH_COMPLETION := $(COMPLETIONS_DIR)/zsh
|
|||||||
INSTALLED_BASH_COMPLETION := $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$(NAME)
|
INSTALLED_BASH_COMPLETION := $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$(NAME)
|
||||||
INSTALLED_ZSH_COMPLETION := $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_$(NAME)
|
INSTALLED_ZSH_COMPLETION := $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_$(NAME)
|
||||||
|
|
||||||
GOLANGCI_LINT := go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2
|
ADD_LICENSE_BIN := go run github.com/google/addlicense@4caba19b7ed7818bb86bc4cd20411a246aa4a524
|
||||||
|
GOLANGCI_LINT_BIN := go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2
|
||||||
|
XGOTEXT_BIN := go run github.com/Tom5521/xgotext@v1.2.0
|
||||||
|
|
||||||
.PHONY: build install clean clear uninstall check-no-root
|
.PHONY: build install clean clear uninstall check-no-root
|
||||||
|
|
||||||
@ -27,10 +29,6 @@ check-no-root:
|
|||||||
exit 1; \
|
exit 1; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# TODO: remove --tests=false
|
|
||||||
fmt:
|
|
||||||
$(GOLANGCI_LINT) run --fix --tests=false
|
|
||||||
|
|
||||||
install: \
|
install: \
|
||||||
$(INSTALED_BIN) \
|
$(INSTALED_BIN) \
|
||||||
$(INSTALLED_BASH_COMPLETION) \
|
$(INSTALLED_BASH_COMPLETION) \
|
||||||
@ -54,3 +52,17 @@ uninstall:
|
|||||||
|
|
||||||
clean clear:
|
clean clear:
|
||||||
rm -f $(BIN)
|
rm -f $(BIN)
|
||||||
|
|
||||||
|
OLD_FILES=$$(< old-files)
|
||||||
|
IGNORE_OLD_FILES := $(foreach file,$(shell cat old-files),-ignore $(file))
|
||||||
|
update-license:
|
||||||
|
$(ADD_LICENSE_BIN) -v -f license-header-old-files.tmpl $(OLD_FILES)
|
||||||
|
$(ADD_LICENSE_BIN) -v -f license-header.tmpl $(IGNORE_OLD_FILES) .
|
||||||
|
|
||||||
|
fmt:
|
||||||
|
$(GOLANGCI_LINT_BIN) run --fix
|
||||||
|
|
||||||
|
i18n:
|
||||||
|
$(XGOTEXT_BIN) --output ./internal/translations/default.pot
|
||||||
|
msguniq --use-first -o ./internal/translations/default.pot ./internal/translations/default.pot
|
||||||
|
msgmerge --backup=off -U ./internal/translations/po/ru/default.po ./internal/translations/default.pot
|
@ -21,7 +21,7 @@ ALR написан на чистом Go и после сборки не имее
|
|||||||
curl -fsSL plemya-x.ru/alr/install.sh | bash
|
curl -fsSL plemya-x.ru/alr/install.sh | bash
|
||||||
```
|
```
|
||||||
|
|
||||||
**ВАЖНО**: При этом скрипт будет загружен и запущен с <https://gitea.plemya-x.ru/xpamych/ALR/install>. Пожалуйста, просматривайте любые скрипты, которые вы скачиваете из Интернета (включая этот), прежде чем запускать их.
|
**ВАЖНО**: При этом скрипт будет загружен и запущен с <https://gitea.plemya-x.ru/Plemya-x/ALR/src/branch/master/scripts/install.sh>. Пожалуйста, просматривайте любые скрипты, которые вы скачиваете из Интернета (включая этот), прежде чем запускать их.
|
||||||
|
|
||||||
### Сборка из исходного кода
|
### Сборка из исходного кода
|
||||||
|
|
||||||
|
180
build.go
180
build.go
@ -1,101 +1,111 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/internal/osutils"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/osutils"
|
||||||
"plemya-x.ru/alr/internal/types"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
|
||||||
"plemya-x.ru/alr/pkg/build"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
|
||||||
"plemya-x.ru/alr/pkg/manager"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
|
||||||
"plemya-x.ru/alr/pkg/repos"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var buildCmd = &cli.Command{
|
func BuildCmd() *cli.Command {
|
||||||
Name: "build",
|
return &cli.Command{
|
||||||
Usage: "Build a local package",
|
Name: "build",
|
||||||
Flags: []cli.Flag{
|
Usage: gotext.Get("Build a local package"),
|
||||||
&cli.StringFlag{
|
Flags: []cli.Flag{
|
||||||
Name: "script",
|
&cli.StringFlag{
|
||||||
Aliases: []string{"s"},
|
Name: "script",
|
||||||
Value: "alr.sh",
|
Aliases: []string{"s"},
|
||||||
Usage: "Path to the build script",
|
Value: "alr.sh",
|
||||||
|
Usage: gotext.Get("Path to the build script"),
|
||||||
|
},
|
||||||
|
&cli.StringFlag{
|
||||||
|
Name: "package",
|
||||||
|
Aliases: []string{"p"},
|
||||||
|
Usage: gotext.Get("Name of the package to build and its repo (example: default/go-bin)"),
|
||||||
|
},
|
||||||
|
&cli.BoolFlag{
|
||||||
|
Name: "clean",
|
||||||
|
Aliases: []string{"c"},
|
||||||
|
Usage: gotext.Get("Build package from scratch even if there's an already built package available"),
|
||||||
|
},
|
||||||
},
|
},
|
||||||
&cli.StringFlag{
|
Action: func(c *cli.Context) error {
|
||||||
Name: "package",
|
ctx := c.Context
|
||||||
Aliases: []string{"p"},
|
|
||||||
Usage: "Name of the package to build and its repo (example: default/go-bin)",
|
|
||||||
},
|
|
||||||
&cli.BoolFlag{
|
|
||||||
Name: "clean",
|
|
||||||
Aliases: []string{"c"},
|
|
||||||
Usage: "Build package from scratch even if there's an already built package available",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
ctx := c.Context
|
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
|
|
||||||
script := c.String("script")
|
script := c.String("script")
|
||||||
if c.String("package") != "" {
|
if c.String("package") != "" {
|
||||||
script = filepath.Join(config.GetPaths(ctx).RepoDir, c.String("package"), "alr.sh")
|
script = filepath.Join(config.GetPaths(ctx).RepoDir, c.String("package"), "alr.sh")
|
||||||
}
|
|
||||||
|
|
||||||
err := repos.Pull(ctx, config.Config(ctx).Repos)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error pulling repositories").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
mgr := manager.Detect()
|
|
||||||
if mgr == nil {
|
|
||||||
log.Fatal("Unable to detect a supported package manager on the system").Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
pkgPaths, _, err := build.BuildPackage(ctx, types.BuildOpts{
|
|
||||||
Script: script,
|
|
||||||
Manager: mgr,
|
|
||||||
Clean: c.Bool("clean"),
|
|
||||||
Interactive: c.Bool("interactive"),
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error building package").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
wd, err := os.Getwd()
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error getting working directory").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, pkgPath := range pkgPaths {
|
|
||||||
name := filepath.Base(pkgPath)
|
|
||||||
err = osutils.Move(pkgPath, filepath.Join(wd, name))
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error moving the package").Err(err).Send()
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
if config.GetInstance(ctx).AutoPull(ctx) {
|
||||||
},
|
err := repos.Pull(ctx, config.Config(ctx).Repos)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error pulling repositories"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mgr := manager.Detect()
|
||||||
|
if mgr == nil {
|
||||||
|
slog.Error(gotext.Get("Unable to detect a supported package manager on the system"))
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
pkgPaths, _, err := build.BuildPackage(ctx, types.BuildOpts{
|
||||||
|
Script: script,
|
||||||
|
Manager: mgr,
|
||||||
|
Clean: c.Bool("clean"),
|
||||||
|
Interactive: c.Bool("interactive"),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error building package"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
wd, err := os.Getwd()
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error getting working directory"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, pkgPath := range pkgPaths {
|
||||||
|
name := filepath.Base(pkgPath)
|
||||||
|
err = osutils.Move(pkgPath, filepath.Join(wd, name))
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error moving the package"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
98
fix.go
98
fix.go
@ -1,65 +1,71 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/internal/db"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
|
||||||
"plemya-x.ru/alr/pkg/repos"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var fixCmd = &cli.Command{
|
func FixCmd() *cli.Command {
|
||||||
Name: "fix",
|
return &cli.Command{
|
||||||
Usage: "Attempt to fix problems with ALR",
|
Name: "fix",
|
||||||
Action: func(c *cli.Context) error {
|
Usage: gotext.Get("Attempt to fix problems with ALR"),
|
||||||
ctx := c.Context
|
Action: func(c *cli.Context) error {
|
||||||
log := loggerctx.From(ctx)
|
ctx := c.Context
|
||||||
|
|
||||||
db.Close()
|
db.Close()
|
||||||
paths := config.GetPaths(ctx)
|
paths := config.GetPaths(ctx)
|
||||||
|
|
||||||
log.Info("Removing cache directory").Send()
|
slog.Info(gotext.Get("Removing cache directory"))
|
||||||
|
|
||||||
err := os.RemoveAll(paths.CacheDir)
|
err := os.RemoveAll(paths.CacheDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Unable to remove cache directory").Err(err).Send()
|
slog.Error(gotext.Get("Unable to remove cache directory"), "err", err)
|
||||||
}
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
log.Info("Rebuilding cache").Send()
|
slog.Info(gotext.Get("Rebuilding cache"))
|
||||||
|
|
||||||
err = os.MkdirAll(paths.CacheDir, 0o755)
|
err = os.MkdirAll(paths.CacheDir, 0o755)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Unable to create new cache directory").Err(err).Send()
|
slog.Error(gotext.Get("Unable to create new cache directory"), "err", err)
|
||||||
}
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
err = repos.Pull(ctx, config.Config(ctx).Repos)
|
err = repos.Pull(ctx, config.Config(ctx).Repos)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error pulling repos").Err(err).Send()
|
slog.Error(gotext.Get("Error pulling repos"), "err", err)
|
||||||
}
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
log.Info("Done").Send()
|
slog.Info(gotext.Get("Done"))
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
92
gen.go
92
gen.go
@ -1,46 +1,66 @@
|
|||||||
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
|
//
|
||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
|
|
||||||
"plemya-x.ru/alr/pkg/gen"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/gen"
|
||||||
)
|
)
|
||||||
|
|
||||||
var genCmd = &cli.Command{
|
func GenCmd() *cli.Command {
|
||||||
Name: "generate",
|
return &cli.Command{
|
||||||
Usage: "Generate a ALR script from a template",
|
Name: "generate",
|
||||||
Aliases: []string{"gen"},
|
Usage: gotext.Get("Generate a ALR script from a template"),
|
||||||
Subcommands: []*cli.Command{
|
Aliases: []string{"gen"},
|
||||||
genPipCmd,
|
Subcommands: []*cli.Command{
|
||||||
},
|
{
|
||||||
}
|
Name: "pip",
|
||||||
|
Usage: gotext.Get("Generate a ALR script for a pip module"),
|
||||||
var genPipCmd = &cli.Command{
|
Flags: []cli.Flag{
|
||||||
Name: "pip",
|
&cli.StringFlag{
|
||||||
Usage: "Generate a ALR script for a pip module",
|
Name: "name",
|
||||||
Flags: []cli.Flag{
|
Aliases: []string{"n"},
|
||||||
&cli.StringFlag{
|
Required: true,
|
||||||
Name: "name",
|
},
|
||||||
Aliases: []string{"n"},
|
&cli.StringFlag{
|
||||||
Required: true,
|
Name: "version",
|
||||||
},
|
Aliases: []string{"v"},
|
||||||
&cli.StringFlag{
|
Required: true,
|
||||||
Name: "version",
|
},
|
||||||
Aliases: []string{"v"},
|
&cli.StringFlag{
|
||||||
Required: true,
|
Name: "description",
|
||||||
},
|
Aliases: []string{"d"},
|
||||||
&cli.StringFlag{
|
},
|
||||||
Name: "description",
|
},
|
||||||
Aliases: []string{"d"},
|
Action: func(c *cli.Context) error {
|
||||||
},
|
return gen.Pip(os.Stdout, gen.PipOptions{
|
||||||
},
|
Name: c.String("name"),
|
||||||
Action: func(c *cli.Context) error {
|
Version: c.String("version"),
|
||||||
return gen.Pip(os.Stdout, gen.PipOptions{
|
Description: c.String("description"),
|
||||||
Name: c.String("name"),
|
})
|
||||||
Version: c.String("version"),
|
},
|
||||||
Description: c.String("description"),
|
},
|
||||||
})
|
},
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
|
41
go.mod
41
go.mod
@ -1,8 +1,8 @@
|
|||||||
module plemya-x.ru/alr
|
module gitea.plemya-x.ru/Plemya-x/ALR
|
||||||
|
|
||||||
go 1.21
|
go 1.22
|
||||||
|
|
||||||
toolchain go1.21.3
|
toolchain go1.23.5
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/AlecAivazis/survey/v2 v2.3.7
|
github.com/AlecAivazis/survey/v2 v2.3.7
|
||||||
@ -10,29 +10,31 @@ require (
|
|||||||
github.com/alecthomas/chroma/v2 v2.9.1
|
github.com/alecthomas/chroma/v2 v2.9.1
|
||||||
github.com/charmbracelet/bubbles v0.16.1
|
github.com/charmbracelet/bubbles v0.16.1
|
||||||
github.com/charmbracelet/bubbletea v0.24.2
|
github.com/charmbracelet/bubbletea v0.24.2
|
||||||
github.com/charmbracelet/lipgloss v0.8.0
|
github.com/charmbracelet/lipgloss v0.10.0
|
||||||
|
github.com/charmbracelet/log v0.4.0
|
||||||
github.com/go-git/go-billy/v5 v5.5.0
|
github.com/go-git/go-billy/v5 v5.5.0
|
||||||
github.com/go-git/go-git/v5 v5.12.0
|
github.com/go-git/go-git/v5 v5.12.0
|
||||||
github.com/goreleaser/nfpm/v2 v2.41.0
|
github.com/goreleaser/nfpm/v2 v2.41.0
|
||||||
|
github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08
|
||||||
github.com/jmoiron/sqlx v1.3.5
|
github.com/jmoiron/sqlx v1.3.5
|
||||||
|
github.com/leonelquinteros/gotext v1.7.0
|
||||||
github.com/mattn/go-isatty v0.0.19
|
github.com/mattn/go-isatty v0.0.19
|
||||||
github.com/mholt/archiver/v4 v4.0.0-alpha.8
|
github.com/mholt/archiver/v4 v4.0.0-alpha.8
|
||||||
github.com/mitchellh/mapstructure v1.5.0
|
github.com/mitchellh/mapstructure v1.5.0
|
||||||
github.com/muesli/reflow v0.3.0
|
github.com/muesli/reflow v0.3.0
|
||||||
github.com/pelletier/go-toml/v2 v2.1.0
|
github.com/pelletier/go-toml/v2 v2.1.0
|
||||||
github.com/schollz/progressbar/v3 v3.13.1
|
github.com/schollz/progressbar/v3 v3.13.1
|
||||||
|
github.com/stretchr/testify v1.10.0
|
||||||
github.com/urfave/cli/v2 v2.25.7
|
github.com/urfave/cli/v2 v2.25.7
|
||||||
github.com/vmihailenco/msgpack/v5 v5.3.5
|
github.com/vmihailenco/msgpack/v5 v5.3.5
|
||||||
go.elara.ws/logger v0.0.0-20230421022458-e80700db2090
|
|
||||||
go.elara.ws/translate v0.0.0-20230421025926-32ccfcd110e6
|
|
||||||
go.elara.ws/vercmp v0.0.0-20230622214216-0b2b067575c4
|
go.elara.ws/vercmp v0.0.0-20230622214216-0b2b067575c4
|
||||||
golang.org/x/crypto v0.23.0
|
golang.org/x/crypto v0.27.0
|
||||||
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb
|
golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb
|
||||||
golang.org/x/sys v0.20.0
|
golang.org/x/sys v0.27.0
|
||||||
golang.org/x/text v0.15.0
|
golang.org/x/text v0.21.0
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
modernc.org/sqlite v1.25.0
|
modernc.org/sqlite v1.25.0
|
||||||
mvdan.cc/sh/v3 v3.7.0
|
mvdan.cc/sh/v3 v3.10.0
|
||||||
plemya-x.ru/fakeroot v0.0.0-20240601131003-c638a3543283
|
plemya-x.ru/fakeroot v0.0.0-20240601131003-c638a3543283
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -56,17 +58,18 @@ require (
|
|||||||
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
|
github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
|
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
|
||||||
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
|
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
|
||||||
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
github.com/dlclark/regexp2 v1.10.0 // indirect
|
github.com/dlclark/regexp2 v1.10.0 // indirect
|
||||||
github.com/dsnet/compress v0.0.1 // indirect
|
github.com/dsnet/compress v0.0.1 // indirect
|
||||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||||
github.com/emirpasic/gods v1.18.1 // indirect
|
github.com/emirpasic/gods v1.18.1 // indirect
|
||||||
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
|
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
|
||||||
|
github.com/go-logfmt/logfmt v0.6.0 // indirect
|
||||||
github.com/gobwas/glob v0.2.3 // indirect
|
github.com/gobwas/glob v0.2.3 // indirect
|
||||||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
||||||
github.com/golang/snappy v0.0.4 // indirect
|
github.com/golang/snappy v0.0.4 // indirect
|
||||||
github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a // indirect
|
github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a // indirect
|
||||||
github.com/google/uuid v1.4.0 // indirect
|
github.com/google/uuid v1.4.0 // indirect
|
||||||
github.com/gookit/color v1.5.1 // indirect
|
|
||||||
github.com/goreleaser/chglog v0.6.1 // indirect
|
github.com/goreleaser/chglog v0.6.1 // indirect
|
||||||
github.com/goreleaser/fileglob v1.3.0 // indirect
|
github.com/goreleaser/fileglob v1.3.0 // indirect
|
||||||
github.com/hashicorp/errwrap v1.0.0 // indirect
|
github.com/hashicorp/errwrap v1.0.0 // indirect
|
||||||
@ -79,7 +82,7 @@ require (
|
|||||||
github.com/klauspost/compress v1.17.11 // indirect
|
github.com/klauspost/compress v1.17.11 // indirect
|
||||||
github.com/klauspost/pgzip v1.2.6 // indirect
|
github.com/klauspost/pgzip v1.2.6 // indirect
|
||||||
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
|
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
|
||||||
github.com/mattn/go-colorable v0.1.2 // indirect
|
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||||
github.com/mattn/go-localereader v0.0.1 // indirect
|
github.com/mattn/go-localereader v0.0.1 // indirect
|
||||||
github.com/mattn/go-runewidth v0.0.15 // indirect
|
github.com/mattn/go-runewidth v0.0.15 // indirect
|
||||||
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
|
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
|
||||||
@ -92,8 +95,9 @@ require (
|
|||||||
github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect
|
github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect
|
||||||
github.com/pierrec/lz4/v4 v4.1.15 // indirect
|
github.com/pierrec/lz4/v4 v4.1.15 // indirect
|
||||||
github.com/pjbgf/sha1cd v0.3.0 // indirect
|
github.com/pjbgf/sha1cd v0.3.0 // indirect
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
||||||
github.com/rivo/uniseg v0.4.4 // indirect
|
github.com/rivo/uniseg v0.4.7 // indirect
|
||||||
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
||||||
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
|
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
|
||||||
github.com/shopspring/decimal v1.2.0 // indirect
|
github.com/shopspring/decimal v1.2.0 // indirect
|
||||||
@ -103,15 +107,14 @@ require (
|
|||||||
github.com/ulikunitz/xz v0.5.12 // indirect
|
github.com/ulikunitz/xz v0.5.12 // indirect
|
||||||
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
|
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
|
||||||
github.com/xanzy/ssh-agent v0.3.3 // indirect
|
github.com/xanzy/ssh-agent v0.3.3 // indirect
|
||||||
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
|
|
||||||
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
|
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
|
||||||
gitlab.com/digitalxero/go-conventional-commit v1.0.7 // indirect
|
gitlab.com/digitalxero/go-conventional-commit v1.0.7 // indirect
|
||||||
go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
|
go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
|
||||||
golang.org/x/mod v0.14.0 // indirect
|
golang.org/x/mod v0.18.0 // indirect
|
||||||
golang.org/x/net v0.23.0 // indirect
|
golang.org/x/net v0.26.0 // indirect
|
||||||
golang.org/x/sync v0.5.0 // indirect
|
golang.org/x/sync v0.10.0 // indirect
|
||||||
golang.org/x/term v0.20.0 // indirect
|
golang.org/x/term v0.25.0 // indirect
|
||||||
golang.org/x/tools v0.16.0 // indirect
|
golang.org/x/tools v0.22.0 // indirect
|
||||||
gopkg.in/warnings.v0 v0.1.2 // indirect
|
gopkg.in/warnings.v0 v0.1.2 // indirect
|
||||||
lukechampine.com/uint128 v1.2.0 // indirect
|
lukechampine.com/uint128 v1.2.0 // indirect
|
||||||
modernc.org/cc/v3 v3.40.0 // indirect
|
modernc.org/cc/v3 v3.40.0 // indirect
|
||||||
|
77
go.sum
77
go.sum
@ -77,8 +77,10 @@ github.com/charmbracelet/bubbles v0.16.1 h1:6uzpAAaT9ZqKssntbvZMlksWHruQLNxg49H5
|
|||||||
github.com/charmbracelet/bubbles v0.16.1/go.mod h1:2QCp9LFlEsBQMvIYERr7Ww2H2bA7xen1idUDIzm/+Xc=
|
github.com/charmbracelet/bubbles v0.16.1/go.mod h1:2QCp9LFlEsBQMvIYERr7Ww2H2bA7xen1idUDIzm/+Xc=
|
||||||
github.com/charmbracelet/bubbletea v0.24.2 h1:uaQIKx9Ai6Gdh5zpTbGiWpytMU+CfsPp06RaW2cx/SY=
|
github.com/charmbracelet/bubbletea v0.24.2 h1:uaQIKx9Ai6Gdh5zpTbGiWpytMU+CfsPp06RaW2cx/SY=
|
||||||
github.com/charmbracelet/bubbletea v0.24.2/go.mod h1:XdrNrV4J8GiyshTtx3DNuYkR1FDaJmO3l2nejekbsgg=
|
github.com/charmbracelet/bubbletea v0.24.2/go.mod h1:XdrNrV4J8GiyshTtx3DNuYkR1FDaJmO3l2nejekbsgg=
|
||||||
github.com/charmbracelet/lipgloss v0.8.0 h1:IS00fk4XAHcf8uZKc3eHeMUTCxUH6NkaTrdyCQk84RU=
|
github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s=
|
||||||
github.com/charmbracelet/lipgloss v0.8.0/go.mod h1:p4eYUZZJ/0oXTuCQKFF8mqyKCz0ja6y+7DniDDw5KKU=
|
github.com/charmbracelet/lipgloss v0.10.0/go.mod h1:Wig9DSfvANsxqkRsqj6x87irdy123SR4dOXlKa91ciE=
|
||||||
|
github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM=
|
||||||
|
github.com/charmbracelet/log v0.4.0/go.mod h1:63bXt/djrizTec0l11H20t8FDSvA4CRZJ1KH22MdptM=
|
||||||
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
||||||
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
||||||
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
||||||
@ -95,6 +97,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
|
|||||||
github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
|
github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
|
||||||
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
|
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
|
||||||
github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
|
github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
|
||||||
|
github.com/creack/pty v1.1.23 h1:4M6+isWdcStXEf15G/RbrMPOQj1dZ7HPZCGwE4kOeP0=
|
||||||
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
|
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
|
||||||
github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
|
github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
@ -127,6 +130,8 @@ github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZt
|
|||||||
github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY=
|
github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY=
|
||||||
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
|
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
|
||||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
||||||
|
github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
|
||||||
|
github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
|
||||||
github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
|
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.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
||||||
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
|
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
|
||||||
@ -171,8 +176,6 @@ github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
|
|||||||
github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
|
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
|
||||||
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
|
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
|
||||||
github.com/gookit/color v1.5.1 h1:Vjg2VEcdHpwq+oY63s/ksHrgJYCTo0bwWvmmYWdE9fQ=
|
|
||||||
github.com/gookit/color v1.5.1/go.mod h1:wZFzea4X8qN6vHOSP2apMb4/+w/orMznEzYsIHPaqKM=
|
|
||||||
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
|
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
|
||||||
github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
|
github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
|
||||||
github.com/goreleaser/chglog v0.6.1 h1:NZKiX8l0FTQPRzBgKST7knvNZmZ04f7PEGkN2wInfhE=
|
github.com/goreleaser/chglog v0.6.1 h1:NZKiX8l0FTQPRzBgKST7knvNZmZ04f7PEGkN2wInfhE=
|
||||||
@ -199,6 +202,8 @@ github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
|
|||||||
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
|
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
|
||||||
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
|
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
|
||||||
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
|
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
|
||||||
|
github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 h1:wMeVzrPO3mfHIWLZtDcSaGAe2I4PW9B/P5nMkRSwCAc=
|
||||||
|
github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o=
|
||||||
github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
|
github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
|
||||||
github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
|
github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
|
||||||
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
|
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
|
||||||
@ -224,15 +229,19 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
|||||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
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 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
|
||||||
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
||||||
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
|
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
|
||||||
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
|
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
|
||||||
github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
|
github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
|
||||||
github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
|
github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
|
||||||
github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
|
|
||||||
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
|
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
|
||||||
|
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
|
||||||
|
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
|
||||||
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
|
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
|
||||||
|
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
||||||
github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
||||||
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
|
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
|
||||||
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||||
@ -287,8 +296,8 @@ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94
|
|||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
||||||
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||||
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
|
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
||||||
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
||||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
||||||
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
|
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
|
||||||
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
|
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
|
||||||
@ -322,11 +331,10 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
|
|||||||
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
||||||
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
|
|
||||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||||
github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw=
|
github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw=
|
||||||
github.com/therootcompany/xz v1.0.1/go.mod h1:3K3UH1yCKgBneZYhuQUvJ9HPD19UEXEI0BWbMn8qNMY=
|
github.com/therootcompany/xz v1.0.1/go.mod h1:3K3UH1yCKgBneZYhuQUvJ9HPD19UEXEI0BWbMn8qNMY=
|
||||||
github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
|
github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
|
||||||
@ -342,17 +350,11 @@ github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM
|
|||||||
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
|
github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
|
||||||
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
|
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
|
||||||
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
|
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
|
||||||
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
|
|
||||||
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
|
|
||||||
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
|
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
|
||||||
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
|
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
|
||||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||||
gitlab.com/digitalxero/go-conventional-commit v1.0.7 h1:8/dO6WWG+98PMhlZowt/YjuiKhqhGlOCwlIV8SqqGh8=
|
gitlab.com/digitalxero/go-conventional-commit v1.0.7 h1:8/dO6WWG+98PMhlZowt/YjuiKhqhGlOCwlIV8SqqGh8=
|
||||||
gitlab.com/digitalxero/go-conventional-commit v1.0.7/go.mod h1:05Xc2BFsSyC5tKhK0y+P3bs0AwUtNuTp+mTpbCU/DZ0=
|
gitlab.com/digitalxero/go-conventional-commit v1.0.7/go.mod h1:05Xc2BFsSyC5tKhK0y+P3bs0AwUtNuTp+mTpbCU/DZ0=
|
||||||
go.elara.ws/logger v0.0.0-20230421022458-e80700db2090 h1:RVC8XvWo6Yw4HUshqx4TSzuBDScDghafU6QFRJ4xPZg=
|
|
||||||
go.elara.ws/logger v0.0.0-20230421022458-e80700db2090/go.mod h1:qng49owViqsW5Aey93lwBXONw20oGbJIoLVscB16mPM=
|
|
||||||
go.elara.ws/translate v0.0.0-20230421025926-32ccfcd110e6 h1:4xCBxLPBn3Y2DuIcj8zQ1tQOFLrpu6tEIGUWn/Q6zPM=
|
|
||||||
go.elara.ws/translate v0.0.0-20230421025926-32ccfcd110e6/go.mod h1:NmfCFqwq7X/aqa/ZVkIysj17JyMEY4Bb5E921kMswNo=
|
|
||||||
go.elara.ws/vercmp v0.0.0-20230622214216-0b2b067575c4 h1:Ep54XceQlKhcCHl9awG+wWP4kz4kIP3c3Lzw/Gc/zwY=
|
go.elara.ws/vercmp v0.0.0-20230622214216-0b2b067575c4 h1:Ep54XceQlKhcCHl9awG+wWP4kz4kIP3c3Lzw/Gc/zwY=
|
||||||
go.elara.ws/vercmp v0.0.0-20230622214216-0b2b067575c4/go.mod h1:/7PNW7nFnDR5W7UXZVc04gdVLR/wBNgkm33KgIz0OBk=
|
go.elara.ws/vercmp v0.0.0-20230622214216-0b2b067575c4/go.mod h1:/7PNW7nFnDR5W7UXZVc04gdVLR/wBNgkm33KgIz0OBk=
|
||||||
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
|
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
|
||||||
@ -370,8 +372,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0
|
|||||||
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
||||||
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
||||||
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
|
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
|
||||||
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
|
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
|
||||||
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
|
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
|
||||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
||||||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
||||||
@ -401,8 +403,10 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
|
|||||||
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||||
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||||
golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
|
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
|
||||||
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||||
|
golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
|
||||||
|
golang.org/x/mod v0.18.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-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-20180826012351-8a410e7b638d/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-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
@ -423,8 +427,10 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
|
|||||||
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
|
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
|
||||||
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
||||||
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
|
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
|
||||||
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
|
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
|
||||||
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
|
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
|
||||||
|
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
|
||||||
|
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
|
||||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||||
@ -438,8 +444,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
|
|||||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
|
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
|
||||||
golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-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-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
@ -457,7 +463,6 @@ golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7w
|
|||||||
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
@ -469,15 +474,17 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|||||||
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
|
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
|
||||||
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||||
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
|
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
|
||||||
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
||||||
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
|
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
|
||||||
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
|
golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
|
||||||
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
|
golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
|
||||||
|
golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
|
||||||
|
golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
|
||||||
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
@ -488,8 +495,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
|||||||
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
||||||
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
||||||
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
|
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
|
||||||
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
|
||||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
@ -518,8 +525,10 @@ golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapK
|
|||||||
golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||||
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
||||||
golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM=
|
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
|
||||||
golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
|
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
|
||||||
|
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
|
||||||
|
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
@ -605,6 +614,8 @@ modernc.org/z v1.7.3 h1:zDJf6iHjrnB+WRD88stbXokugjyc0/pB91ri1gO6LZY=
|
|||||||
modernc.org/z v1.7.3/go.mod h1:Ipv4tsdxZRbQyLq9Q1M6gdbkxYzdlrciF2Hi/lS7nWE=
|
modernc.org/z v1.7.3/go.mod h1:Ipv4tsdxZRbQyLq9Q1M6gdbkxYzdlrciF2Hi/lS7nWE=
|
||||||
mvdan.cc/sh/v3 v3.7.0 h1:lSTjdP/1xsddtaKfGg7Myu7DnlHItd3/M2tomOcNNBg=
|
mvdan.cc/sh/v3 v3.7.0 h1:lSTjdP/1xsddtaKfGg7Myu7DnlHItd3/M2tomOcNNBg=
|
||||||
mvdan.cc/sh/v3 v3.7.0/go.mod h1:K2gwkaesF/D7av7Kxl0HbF5kGOd2ArupNTX3X44+8l8=
|
mvdan.cc/sh/v3 v3.7.0/go.mod h1:K2gwkaesF/D7av7Kxl0HbF5kGOd2ArupNTX3X44+8l8=
|
||||||
|
mvdan.cc/sh/v3 v3.10.0 h1:v9z7N1DLZ7owyLM/SXZQkBSXcwr2IGMm2LY2pmhVXj4=
|
||||||
|
mvdan.cc/sh/v3 v3.10.0/go.mod h1:z/mSSVyLFGZzqb3ZIKojjyqIx/xbmz/UHdCSv9HmqXY=
|
||||||
plemya-x.ru/fakeroot v0.0.0-20240601131003-c638a3543283 h1:BXCLPeA8g2M6qYngicyxyB/2Bo4J54Q9Rb+8jMmE3ik=
|
plemya-x.ru/fakeroot v0.0.0-20240601131003-c638a3543283 h1:BXCLPeA8g2M6qYngicyxyB/2Bo4J54Q9Rb+8jMmE3ik=
|
||||||
plemya-x.ru/fakeroot v0.0.0-20240601131003-c638a3543283/go.mod h1:itzL9Jx52VXOhRaucFHuMpa3y7iwjnuLGdNvypoh/S4=
|
plemya-x.ru/fakeroot v0.0.0-20240601131003-c638a3543283/go.mod h1:itzL9Jx52VXOhRaucFHuMpa3y7iwjnuLGdNvypoh/S4=
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
||||||
|
156
helper.go
156
helper.go
@ -1,87 +1,111 @@
|
|||||||
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
|
//
|
||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
"mvdan.cc/sh/v3/expand"
|
"mvdan.cc/sh/v3/expand"
|
||||||
"mvdan.cc/sh/v3/interp"
|
"mvdan.cc/sh/v3/interp"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/cpu"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu"
|
||||||
"plemya-x.ru/alr/internal/shutils/helpers"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/helpers"
|
||||||
"plemya-x.ru/alr/pkg/distro"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var helperCmd = &cli.Command{
|
func HelperCmd() *cli.Command {
|
||||||
Name: "helper",
|
helperListCmd := &cli.Command{
|
||||||
Usage: "Run a ALR helper command",
|
Name: "list",
|
||||||
ArgsUsage: `<helper_name|"list">`,
|
Usage: gotext.Get("List all the available helper commands"),
|
||||||
Subcommands: []*cli.Command{helperListCmd},
|
Aliases: []string{"ls"},
|
||||||
Flags: []cli.Flag{
|
Action: func(ctx *cli.Context) error {
|
||||||
&cli.StringFlag{
|
for name := range helpers.Helpers {
|
||||||
Name: "dest-dir",
|
fmt.Println(name)
|
||||||
Aliases: []string{"d"},
|
}
|
||||||
Usage: "The directory that the install commands will install to",
|
return nil
|
||||||
Value: "dest",
|
|
||||||
},
|
},
|
||||||
},
|
}
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
ctx := c.Context
|
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
|
|
||||||
if c.Args().Len() < 1 {
|
return &cli.Command{
|
||||||
cli.ShowSubcommandHelpAndExit(c, 1)
|
Name: "helper",
|
||||||
}
|
Usage: gotext.Get("Run a ALR helper command"),
|
||||||
|
ArgsUsage: `<helper_name|"list">`,
|
||||||
|
Subcommands: []*cli.Command{helperListCmd},
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
&cli.StringFlag{
|
||||||
|
Name: "dest-dir",
|
||||||
|
Aliases: []string{"d"},
|
||||||
|
Usage: gotext.Get("The directory that the install commands will install to"),
|
||||||
|
Value: "dest",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
ctx := c.Context
|
||||||
|
|
||||||
helper, ok := helpers.Helpers[c.Args().First()]
|
if c.Args().Len() < 1 {
|
||||||
if !ok {
|
cli.ShowSubcommandHelpAndExit(c, 1)
|
||||||
log.Fatal("No such helper command").Str("name", c.Args().First()).Send()
|
}
|
||||||
}
|
|
||||||
|
|
||||||
wd, err := os.Getwd()
|
helper, ok := helpers.Helpers[c.Args().First()]
|
||||||
if err != nil {
|
if !ok {
|
||||||
log.Fatal("Error getting working directory").Err(err).Send()
|
slog.Error(gotext.Get("No such helper command"), "name", c.Args().First())
|
||||||
}
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
info, err := distro.ParseOSRelease(ctx)
|
wd, err := os.Getwd()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error getting working directory").Err(err).Send()
|
slog.Error(gotext.Get("Error getting working directory"), "err", err)
|
||||||
}
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
hc := interp.HandlerContext{
|
info, err := distro.ParseOSRelease(ctx)
|
||||||
Env: expand.ListEnviron(
|
if err != nil {
|
||||||
"pkgdir="+c.String("dest-dir"),
|
slog.Error(gotext.Get("Error getting working directory"), "err", err)
|
||||||
"DISTRO_ID="+info.ID,
|
os.Exit(1)
|
||||||
"DISTRO_ID_LIKE="+strings.Join(info.Like, " "),
|
}
|
||||||
"ARCH="+cpu.Arch(),
|
|
||||||
),
|
|
||||||
Dir: wd,
|
|
||||||
Stdin: os.Stdin,
|
|
||||||
Stdout: os.Stdout,
|
|
||||||
Stderr: os.Stderr,
|
|
||||||
}
|
|
||||||
|
|
||||||
return helper(hc, c.Args().First(), c.Args().Slice()[1:])
|
hc := interp.HandlerContext{
|
||||||
},
|
Env: expand.ListEnviron(
|
||||||
CustomHelpTemplate: cli.CommandHelpTemplate,
|
"pkgdir="+c.String("dest-dir"),
|
||||||
BashComplete: func(ctx *cli.Context) {
|
"DISTRO_ID="+info.ID,
|
||||||
for name := range helpers.Helpers {
|
"DISTRO_ID_LIKE="+strings.Join(info.Like, " "),
|
||||||
fmt.Println(name)
|
"ARCH="+cpu.Arch(),
|
||||||
}
|
),
|
||||||
},
|
Dir: wd,
|
||||||
}
|
Stdin: os.Stdin,
|
||||||
|
Stdout: os.Stdout,
|
||||||
var helperListCmd = &cli.Command{
|
Stderr: os.Stderr,
|
||||||
Name: "list",
|
}
|
||||||
Usage: "List all the available helper commands",
|
|
||||||
Aliases: []string{"ls"},
|
return helper(hc, c.Args().First(), c.Args().Slice()[1:])
|
||||||
Action: func(ctx *cli.Context) error {
|
},
|
||||||
for name := range helpers.Helpers {
|
CustomHelpTemplate: cli.CommandHelpTemplate,
|
||||||
fmt.Println(name)
|
BashComplete: func(ctx *cli.Context) {
|
||||||
}
|
for name := range helpers.Helpers {
|
||||||
return nil
|
fmt.Println(name)
|
||||||
},
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
184
info.go
184
info.go
@ -1,107 +1,129 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
"gopkg.in/yaml.v3"
|
"gopkg.in/yaml.v3"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/cliutils"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/internal/overrides"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
"plemya-x.ru/alr/pkg/distro"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
|
||||||
"plemya-x.ru/alr/pkg/repos"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
|
||||||
)
|
)
|
||||||
|
|
||||||
var infoCmd = &cli.Command{
|
func InfoCmd() *cli.Command {
|
||||||
Name: "info",
|
return &cli.Command{
|
||||||
Usage: "Print information about a package",
|
Name: "info",
|
||||||
Flags: []cli.Flag{
|
Usage: gotext.Get("Print information about a package"),
|
||||||
&cli.BoolFlag{
|
Flags: []cli.Flag{
|
||||||
Name: "all",
|
&cli.BoolFlag{
|
||||||
Aliases: []string{"a"},
|
Name: "all",
|
||||||
Usage: "Show all information, not just for the current distro",
|
Aliases: []string{"a"},
|
||||||
|
Usage: gotext.Get("Show all information, not just for the current distro"),
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
Action: func(c *cli.Context) error {
|
||||||
Action: func(c *cli.Context) error {
|
ctx := c.Context
|
||||||
ctx := c.Context
|
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
|
|
||||||
args := c.Args()
|
cfg := config.New()
|
||||||
if args.Len() < 1 {
|
db := db.New(cfg)
|
||||||
log.Fatalf("Command info expected at least 1 argument, got %d", args.Len()).Send()
|
err := db.Init(ctx)
|
||||||
}
|
|
||||||
|
|
||||||
err := repos.Pull(ctx, config.Config(ctx).Repos)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error pulling repositories").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
found, _, err := repos.FindPkgs(ctx, args.Slice())
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error finding packages").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(found) == 0 {
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
pkgs := cliutils.FlattenPkgs(ctx, found, "show", c.Bool("interactive"))
|
|
||||||
|
|
||||||
var names []string
|
|
||||||
all := c.Bool("all")
|
|
||||||
|
|
||||||
if !all {
|
|
||||||
info, err := distro.ParseOSRelease(ctx)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error parsing os-release file").Err(err).Send()
|
slog.Error(gotext.Get("Error initialization database"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
names, err = overrides.Resolve(
|
rs := repos.New(cfg, db)
|
||||||
info,
|
|
||||||
overrides.DefaultOpts.
|
args := c.Args()
|
||||||
WithLanguages([]string{config.SystemLang()}),
|
if args.Len() < 1 {
|
||||||
)
|
slog.Error(gotext.Get("Command info expected at least 1 argument, got %d", args.Len()))
|
||||||
if err != nil {
|
os.Exit(1)
|
||||||
log.Fatal("Error resolving overrides").Err(err).Send()
|
}
|
||||||
}
|
|
||||||
}
|
if cfg.AutoPull(ctx) {
|
||||||
|
err := rs.Pull(ctx, cfg.Repos(ctx))
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error pulling repos"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
found, _, err := rs.FindPkgs(ctx, args.Slice())
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error finding packages"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(found) == 0 {
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
pkgs := cliutils.FlattenPkgs(ctx, found, "show", c.Bool("interactive"))
|
||||||
|
|
||||||
|
var names []string
|
||||||
|
all := c.Bool("all")
|
||||||
|
|
||||||
for _, pkg := range pkgs {
|
|
||||||
if !all {
|
if !all {
|
||||||
err = yaml.NewEncoder(os.Stdout).Encode(overrides.ResolvePackage(&pkg, names))
|
info, err := distro.ParseOSRelease(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error encoding script variables").Err(err).Send()
|
slog.Error(gotext.Get("Error parsing os-release file"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
} else {
|
names, err = overrides.Resolve(
|
||||||
err = yaml.NewEncoder(os.Stdout).Encode(pkg)
|
info,
|
||||||
|
overrides.DefaultOpts.
|
||||||
|
WithLanguages([]string{config.SystemLang()}),
|
||||||
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error encoding script variables").Err(err).Send()
|
slog.Error(gotext.Get("Error resolving overrides"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Println("---")
|
for _, pkg := range pkgs {
|
||||||
}
|
if !all {
|
||||||
|
err = yaml.NewEncoder(os.Stdout).Encode(overrides.ResolvePackage(&pkg, names))
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error encoding script variables"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
err = yaml.NewEncoder(os.Stdout).Encode(pkg)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error encoding script variables"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
fmt.Println("---")
|
||||||
},
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
220
install.go
220
install.go
@ -1,123 +1,137 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log/slog"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/cliutils"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/internal/db"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
"plemya-x.ru/alr/internal/types"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
|
||||||
"plemya-x.ru/alr/pkg/build"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
|
||||||
"plemya-x.ru/alr/pkg/manager"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
|
||||||
"plemya-x.ru/alr/pkg/repos"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var installCmd = &cli.Command{
|
func InstallCmd() *cli.Command {
|
||||||
Name: "install",
|
return &cli.Command{
|
||||||
Usage: "Install a new package",
|
Name: "install",
|
||||||
Aliases: []string{"in"},
|
Usage: gotext.Get("Install a new package"),
|
||||||
Flags: []cli.Flag{
|
Aliases: []string{"in"},
|
||||||
&cli.BoolFlag{
|
Flags: []cli.Flag{
|
||||||
Name: "clean",
|
&cli.BoolFlag{
|
||||||
Aliases: []string{"c"},
|
Name: "clean",
|
||||||
Usage: "Build package from scratch even if there's an already built package available",
|
Aliases: []string{"c"},
|
||||||
|
Usage: "Build package from scratch even if there's an already built package available",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
Action: func(c *cli.Context) error {
|
||||||
Action: func(c *cli.Context) error {
|
ctx := c.Context
|
||||||
ctx := c.Context
|
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
|
|
||||||
args := c.Args()
|
args := c.Args()
|
||||||
if args.Len() < 1 {
|
if args.Len() < 1 {
|
||||||
log.Fatalf("Command install expected at least 1 argument, got %d", args.Len()).Send()
|
slog.Error(gotext.Get("Command install expected at least 1 argument, got %d", args.Len()))
|
||||||
}
|
os.Exit(1)
|
||||||
|
|
||||||
mgr := manager.Detect()
|
|
||||||
if mgr == nil {
|
|
||||||
log.Fatal("Unable to detect a supported package manager on the system").Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
err := repos.Pull(ctx, config.Config(ctx).Repos)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error pulling repositories").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
found, notFound, err := repos.FindPkgs(ctx, args.Slice())
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error finding packages").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
pkgs := cliutils.FlattenPkgs(ctx, found, "install", c.Bool("interactive"))
|
|
||||||
build.InstallPkgs(ctx, pkgs, notFound, types.BuildOpts{
|
|
||||||
Manager: mgr,
|
|
||||||
Clean: c.Bool("clean"),
|
|
||||||
Interactive: c.Bool("interactive"),
|
|
||||||
})
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
BashComplete: func(c *cli.Context) {
|
|
||||||
log := loggerctx.From(c.Context)
|
|
||||||
result, err := db.GetPkgs(c.Context, "true")
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error getting packages").Err(err).Send()
|
|
||||||
}
|
|
||||||
defer result.Close()
|
|
||||||
|
|
||||||
for result.Next() {
|
|
||||||
var pkg db.Package
|
|
||||||
err = result.StructScan(&pkg)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error iterating over packages").Err(err).Send()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Println(pkg.Name)
|
mgr := manager.Detect()
|
||||||
}
|
if mgr == nil {
|
||||||
},
|
slog.Error(gotext.Get("Unable to detect a supported package manager on the system"))
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
if config.GetInstance(ctx).AutoPull(ctx) {
|
||||||
|
err := repos.Pull(ctx, config.Config(ctx).Repos)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error pulling repositories"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
found, notFound, err := repos.FindPkgs(ctx, args.Slice())
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error finding packages"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
pkgs := cliutils.FlattenPkgs(ctx, found, "install", c.Bool("interactive"))
|
||||||
|
build.InstallPkgs(ctx, pkgs, notFound, types.BuildOpts{
|
||||||
|
Manager: mgr,
|
||||||
|
Clean: c.Bool("clean"),
|
||||||
|
Interactive: c.Bool("interactive"),
|
||||||
|
})
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
BashComplete: func(c *cli.Context) {
|
||||||
|
result, err := db.GetPkgs(c.Context, "true")
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error getting packages"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
defer result.Close()
|
||||||
|
|
||||||
|
for result.Next() {
|
||||||
|
var pkg db.Package
|
||||||
|
err = result.StructScan(&pkg)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error iterating over packages"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Println(pkg.Name)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var removeCmd = &cli.Command{
|
func RemoveCmd() *cli.Command {
|
||||||
Name: "remove",
|
return &cli.Command{
|
||||||
Usage: "Remove an installed package",
|
Name: "remove",
|
||||||
Aliases: []string{"rm"},
|
Usage: gotext.Get("Remove an installed package"),
|
||||||
Action: func(c *cli.Context) error {
|
Aliases: []string{"rm"},
|
||||||
log := loggerctx.From(c.Context)
|
Action: func(c *cli.Context) error {
|
||||||
|
args := c.Args()
|
||||||
|
if args.Len() < 1 {
|
||||||
|
slog.Error(gotext.Get("Command remove expected at least 1 argument, got %d", args.Len()))
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
args := c.Args()
|
mgr := manager.Detect()
|
||||||
if args.Len() < 1 {
|
if mgr == nil {
|
||||||
log.Fatalf("Command remove expected at least 1 argument, got %d", args.Len()).Send()
|
slog.Error(gotext.Get("Unable to detect a supported package manager on the system"))
|
||||||
}
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
mgr := manager.Detect()
|
err := mgr.Remove(nil, c.Args().Slice()...)
|
||||||
if mgr == nil {
|
if err != nil {
|
||||||
log.Fatal("Unable to detect a supported package manager on the system").Send()
|
slog.Error(gotext.Get("Error removing packages"), "err", err)
|
||||||
}
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
err := mgr.Remove(nil, c.Args().Slice()...)
|
return nil
|
||||||
if err != nil {
|
},
|
||||||
log.Fatal("Error removing packages").Err(err).Send()
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
@ -1,35 +1,35 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package cliutils
|
package cliutils
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/AlecAivazis/survey/v2"
|
"github.com/AlecAivazis/survey/v2"
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
"plemya-x.ru/alr/internal/db"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/pager"
|
||||||
"plemya-x.ru/alr/internal/pager"
|
|
||||||
"plemya-x.ru/alr/internal/translations"
|
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// YesNoPrompt asks the user a yes or no question, using def as the default answer
|
// YesNoPrompt asks the user a yes or no question, using def as the default answer
|
||||||
@ -38,7 +38,7 @@ func YesNoPrompt(ctx context.Context, msg string, interactive, def bool) (bool,
|
|||||||
var answer bool
|
var answer bool
|
||||||
err := survey.AskOne(
|
err := survey.AskOne(
|
||||||
&survey.Confirm{
|
&survey.Confirm{
|
||||||
Message: translations.Translator(ctx).TranslateTo(msg, config.Language(ctx)),
|
Message: msg,
|
||||||
Default: def,
|
Default: def,
|
||||||
},
|
},
|
||||||
&answer,
|
&answer,
|
||||||
@ -53,14 +53,11 @@ func YesNoPrompt(ctx context.Context, msg string, interactive, def bool) (bool,
|
|||||||
// shows it if they answer yes, then asks if they'd still like to
|
// shows it if they answer yes, then asks if they'd still like to
|
||||||
// continue, and exits if they answer no.
|
// continue, and exits if they answer no.
|
||||||
func PromptViewScript(ctx context.Context, script, name, style string, interactive bool) error {
|
func PromptViewScript(ctx context.Context, script, name, style string, interactive bool) error {
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
|
|
||||||
if !interactive {
|
if !interactive {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
scriptPrompt := translations.Translator(ctx).TranslateTo("Would you like to view the build script for", config.Language(ctx)) + " " + name
|
view, err := YesNoPrompt(ctx, gotext.Get("Would you like to view the build script for %s", name), interactive, false)
|
||||||
view, err := YesNoPrompt(ctx, scriptPrompt, interactive, false)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -71,13 +68,14 @@ func PromptViewScript(ctx context.Context, script, name, style string, interacti
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
cont, err := YesNoPrompt(ctx, "Would you still like to continue?", interactive, false)
|
cont, err := YesNoPrompt(ctx, gotext.Get("Would you still like to continue?"), interactive, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if !cont {
|
if !cont {
|
||||||
log.Fatal(translations.Translator(ctx).TranslateTo("User chose not to continue after reading script", config.Language(ctx))).Send()
|
slog.Error(gotext.Get("User chose not to continue after reading script"))
|
||||||
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -105,13 +103,13 @@ func ShowScript(path, name, style string) error {
|
|||||||
// FlattenPkgs attempts to flatten the a map of slices of packages into a single slice
|
// 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.
|
// of packages by prompting the user if multiple packages match.
|
||||||
func FlattenPkgs(ctx context.Context, found map[string][]db.Package, verb string, interactive bool) []db.Package {
|
func FlattenPkgs(ctx context.Context, found map[string][]db.Package, verb string, interactive bool) []db.Package {
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
var outPkgs []db.Package
|
var outPkgs []db.Package
|
||||||
for _, pkgs := range found {
|
for _, pkgs := range found {
|
||||||
if len(pkgs) > 1 && interactive {
|
if len(pkgs) > 1 && interactive {
|
||||||
choice, err := PkgPrompt(ctx, pkgs, verb, interactive)
|
choice, err := PkgPrompt(ctx, pkgs, verb, interactive)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error prompting for choice of package").Send()
|
slog.Error(gotext.Get("Error prompting for choice of package"))
|
||||||
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
outPkgs = append(outPkgs, choice)
|
outPkgs = append(outPkgs, choice)
|
||||||
} else if len(pkgs) == 1 || !interactive {
|
} else if len(pkgs) == 1 || !interactive {
|
||||||
@ -134,7 +132,7 @@ func PkgPrompt(ctx context.Context, options []db.Package, verb string, interacti
|
|||||||
|
|
||||||
prompt := &survey.Select{
|
prompt := &survey.Select{
|
||||||
Options: names,
|
Options: names,
|
||||||
Message: translations.Translator(ctx).TranslateTo("Choose which package to "+verb, config.Language(ctx)),
|
Message: gotext.Get("Choose which package to %s", verb),
|
||||||
}
|
}
|
||||||
|
|
||||||
var choice int
|
var choice int
|
||||||
@ -155,7 +153,7 @@ func ChooseOptDepends(ctx context.Context, options []string, verb string, intera
|
|||||||
|
|
||||||
prompt := &survey.MultiSelect{
|
prompt := &survey.MultiSelect{
|
||||||
Options: options,
|
Options: options,
|
||||||
Message: translations.Translator(ctx).TranslateTo("Choose which optional package(s) to install", config.Language(ctx)),
|
Message: gotext.Get("Choose which optional package(s) to install"),
|
||||||
}
|
}
|
||||||
|
|
||||||
var choices []int
|
var choices []int
|
||||||
|
@ -1,38 +1,51 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package config
|
package config
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/pelletier/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/types"
|
"github.com/leonelquinteros/gotext"
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type ALRConfig struct {
|
||||||
|
cfg *types.Config
|
||||||
|
paths *Paths
|
||||||
|
|
||||||
|
cfgOnce sync.Once
|
||||||
|
pathsOnce sync.Once
|
||||||
|
}
|
||||||
|
|
||||||
var defaultConfig = &types.Config{
|
var defaultConfig = &types.Config{
|
||||||
RootCmd: "sudo",
|
RootCmd: "sudo",
|
||||||
PagerStyle: "native",
|
PagerStyle: "native",
|
||||||
IgnorePkgUpdates: []string{},
|
IgnorePkgUpdates: []string{},
|
||||||
|
AutoPull: true,
|
||||||
Repos: []types.Repo{
|
Repos: []types.Repo{
|
||||||
{
|
{
|
||||||
Name: "default",
|
Name: "default",
|
||||||
@ -41,40 +54,119 @@ var defaultConfig = &types.Config{
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
func New() *ALRConfig {
|
||||||
configMtx sync.Mutex
|
return &ALRConfig{}
|
||||||
config *types.Config
|
}
|
||||||
)
|
|
||||||
|
|
||||||
// Config returns a ALR configuration struct.
|
func (c *ALRConfig) Load(ctx context.Context) {
|
||||||
// The first time it's called, it'll load the config from a file.
|
cfgFl, err := os.Open(c.GetPaths(ctx).ConfigPath)
|
||||||
// Subsequent calls will just return the same value.
|
if err != nil {
|
||||||
func Config(ctx context.Context) *types.Config {
|
slog.Warn(gotext.Get("Error opening config file, using defaults"), "err", err)
|
||||||
configMtx.Lock()
|
c.cfg = defaultConfig
|
||||||
defer configMtx.Unlock()
|
return
|
||||||
log := loggerctx.From(ctx)
|
}
|
||||||
|
defer cfgFl.Close()
|
||||||
|
|
||||||
if config == nil {
|
// Copy the default configuration into config
|
||||||
cfgFl, err := os.Open(GetPaths(ctx).ConfigPath)
|
defCopy := *defaultConfig
|
||||||
if err != nil {
|
config := &defCopy
|
||||||
log.Warn("Error opening config file, using defaults").Err(err).Send()
|
config.Repos = nil
|
||||||
return defaultConfig
|
|
||||||
}
|
|
||||||
defer cfgFl.Close()
|
|
||||||
|
|
||||||
// Copy the default configuration into config
|
err = toml.NewDecoder(cfgFl).Decode(config)
|
||||||
defCopy := *defaultConfig
|
if err != nil {
|
||||||
config = &defCopy
|
slog.Warn(gotext.Get("Error decoding config file, using defaults"), "err", err)
|
||||||
config.Repos = nil
|
c.cfg = defaultConfig
|
||||||
|
return
|
||||||
|
}
|
||||||
|
c.cfg = config
|
||||||
|
}
|
||||||
|
|
||||||
err = toml.NewDecoder(cfgFl).Decode(config)
|
func (c *ALRConfig) initPaths() {
|
||||||
if err != nil {
|
paths := &Paths{}
|
||||||
log.Warn("Error decoding config file, using defaults").Err(err).Send()
|
|
||||||
// Set config back to nil so that we try again next time
|
cfgDir, err := os.UserConfigDir()
|
||||||
config = nil
|
if err != nil {
|
||||||
return defaultConfig
|
slog.Error(gotext.Get("Unable to detect user config directory"), "err", err)
|
||||||
}
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
return config
|
paths.ConfigDir = filepath.Join(cfgDir, "alr")
|
||||||
|
|
||||||
|
err = os.MkdirAll(paths.ConfigDir, 0o755)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Unable to create ALR config directory"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
paths.ConfigPath = filepath.Join(paths.ConfigDir, "alr.toml")
|
||||||
|
|
||||||
|
if _, err := os.Stat(paths.ConfigPath); err != nil {
|
||||||
|
cfgFl, err := os.Create(paths.ConfigPath)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Unable to create ALR config file"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = toml.NewEncoder(cfgFl).Encode(&defaultConfig)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error encoding default configuration"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
cfgFl.Close()
|
||||||
|
}
|
||||||
|
|
||||||
|
cacheDir, err := os.UserCacheDir()
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Unable to detect cache directory"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
paths.CacheDir = filepath.Join(cacheDir, "alr")
|
||||||
|
paths.RepoDir = filepath.Join(paths.CacheDir, "repo")
|
||||||
|
paths.PkgsDir = filepath.Join(paths.CacheDir, "pkgs")
|
||||||
|
|
||||||
|
err = os.MkdirAll(paths.RepoDir, 0o755)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Unable to create repo cache directory"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = os.MkdirAll(paths.PkgsDir, 0o755)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Unable to create package cache directory"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
paths.DBPath = filepath.Join(paths.CacheDir, "db")
|
||||||
|
|
||||||
|
c.paths = paths
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ALRConfig) GetPaths(ctx context.Context) *Paths {
|
||||||
|
c.pathsOnce.Do(func() {
|
||||||
|
c.initPaths()
|
||||||
|
})
|
||||||
|
return c.paths
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ALRConfig) Repos(ctx context.Context) []types.Repo {
|
||||||
|
c.cfgOnce.Do(func() {
|
||||||
|
c.Load(ctx)
|
||||||
|
})
|
||||||
|
return c.cfg.Repos
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ALRConfig) IgnorePkgUpdates(ctx context.Context) []string {
|
||||||
|
c.cfgOnce.Do(func() {
|
||||||
|
c.Load(ctx)
|
||||||
|
})
|
||||||
|
return c.cfg.IgnorePkgUpdates
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ALRConfig) AutoPull(ctx context.Context) bool {
|
||||||
|
c.cfgOnce.Do(func() {
|
||||||
|
c.Load(ctx)
|
||||||
|
})
|
||||||
|
return c.cfg.AutoPull
|
||||||
}
|
}
|
||||||
|
52
internal/config/config_legacy.go
Normal file
52
internal/config/config_legacy.go
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package config
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Config returns a ALR configuration struct.
|
||||||
|
// The first time it's called, it'll load the config from a file.
|
||||||
|
// Subsequent calls will just return the same value.
|
||||||
|
//
|
||||||
|
// Deprecated: use struct method
|
||||||
|
func Config(ctx context.Context) *types.Config {
|
||||||
|
return GetInstance(ctx).cfg
|
||||||
|
}
|
||||||
|
|
||||||
|
// =======================
|
||||||
|
// FOR LEGACY ONLY
|
||||||
|
// =======================
|
||||||
|
|
||||||
|
var (
|
||||||
|
alrConfig *ALRConfig
|
||||||
|
alrConfigOnce sync.Once
|
||||||
|
)
|
||||||
|
|
||||||
|
// Deprecated: For legacy only
|
||||||
|
func GetInstance(ctx context.Context) *ALRConfig {
|
||||||
|
alrConfigOnce.Do(func() {
|
||||||
|
alrConfig = New()
|
||||||
|
alrConfig.Load(ctx)
|
||||||
|
})
|
||||||
|
|
||||||
|
return alrConfig
|
||||||
|
}
|
@ -1,32 +1,33 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package config
|
package config
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
"golang.org/x/text/language"
|
"golang.org/x/text/language"
|
||||||
|
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -42,12 +43,12 @@ var (
|
|||||||
func Language(ctx context.Context) language.Tag {
|
func Language(ctx context.Context) language.Tag {
|
||||||
langMtx.Lock()
|
langMtx.Lock()
|
||||||
defer langMtx.Unlock()
|
defer langMtx.Unlock()
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
if !langSet {
|
if !langSet {
|
||||||
syslang := SystemLang()
|
syslang := SystemLang()
|
||||||
tag, err := language.Parse(syslang)
|
tag, err := language.Parse(syslang)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error parsing system language").Err(err).Send()
|
slog.Error(gotext.Get("Error parsing system language"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
base, _ := tag.Base()
|
base, _ := tag.Base()
|
||||||
lang = language.Make(base.String())
|
lang = language.Make(base.String())
|
||||||
|
@ -1,32 +1,26 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package config
|
package config
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"sync"
|
|
||||||
|
|
||||||
"github.com/pelletier/go-toml/v2"
|
|
||||||
|
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Paths contains various paths used by ALR
|
// Paths contains various paths used by ALR
|
||||||
@ -39,71 +33,13 @@ type Paths struct {
|
|||||||
DBPath string
|
DBPath string
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
|
||||||
pathsMtx sync.Mutex
|
|
||||||
paths *Paths
|
|
||||||
)
|
|
||||||
|
|
||||||
// GetPaths returns a Paths struct.
|
// GetPaths returns a Paths struct.
|
||||||
// The first time it's called, it'll generate the struct
|
// The first time it's called, it'll generate the struct
|
||||||
// using information from the system.
|
// using information from the system.
|
||||||
// Subsequent calls will return the same value.
|
// Subsequent calls will return the same value.
|
||||||
|
//
|
||||||
|
// Depreacted: use struct API
|
||||||
func GetPaths(ctx context.Context) *Paths {
|
func GetPaths(ctx context.Context) *Paths {
|
||||||
pathsMtx.Lock()
|
alrConfig := GetInstance(ctx)
|
||||||
defer pathsMtx.Unlock()
|
return alrConfig.GetPaths(ctx)
|
||||||
|
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
if paths == nil {
|
|
||||||
paths = &Paths{}
|
|
||||||
|
|
||||||
cfgDir, err := os.UserConfigDir()
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Unable to detect user config directory").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
paths.ConfigDir = filepath.Join(cfgDir, "alr")
|
|
||||||
|
|
||||||
err = os.MkdirAll(paths.ConfigDir, 0o755)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Unable to create ALR config directory").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
paths.ConfigPath = filepath.Join(paths.ConfigDir, "alr.toml")
|
|
||||||
|
|
||||||
if _, err := os.Stat(paths.ConfigPath); err != nil {
|
|
||||||
cfgFl, err := os.Create(paths.ConfigPath)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Unable to create ALR config file").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
err = toml.NewEncoder(cfgFl).Encode(&defaultConfig)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error encoding default configuration").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
cfgFl.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
cacheDir, err := os.UserCacheDir()
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Unable to detect cache directory").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
paths.CacheDir = filepath.Join(cacheDir, "alr")
|
|
||||||
paths.RepoDir = filepath.Join(paths.CacheDir, "repo")
|
|
||||||
paths.PkgsDir = filepath.Join(paths.CacheDir, "pkgs")
|
|
||||||
|
|
||||||
err = os.MkdirAll(paths.RepoDir, 0o755)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Unable to create repo cache directory").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
err = os.MkdirAll(paths.PkgsDir, 0o755)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Unable to create package cache directory").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
paths.DBPath = filepath.Join(paths.CacheDir, "db")
|
|
||||||
}
|
|
||||||
return paths
|
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,22 @@
|
|||||||
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
|
//
|
||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package config
|
package config
|
||||||
|
|
||||||
// Version contains the version of ALR. If the version
|
// Version contains the version of ALR. If the version
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package cpu
|
package cpu
|
||||||
|
|
||||||
|
@ -1,48 +1,38 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package db
|
package db
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"database/sql"
|
"log/slog"
|
||||||
"database/sql/driver"
|
|
||||||
"encoding/json"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"sync"
|
|
||||||
|
|
||||||
"github.com/jmoiron/sqlx"
|
"github.com/jmoiron/sqlx"
|
||||||
"golang.org/x/exp/slices"
|
"github.com/leonelquinteros/gotext"
|
||||||
"modernc.org/sqlite"
|
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// CurrentVersion is the current version of the database.
|
// CurrentVersion is the current version of the database.
|
||||||
// The database is reset if its version doesn't match this.
|
// The database is reset if its version doesn't match this.
|
||||||
const CurrentVersion = 2
|
const CurrentVersion = 2
|
||||||
|
|
||||||
func init() {
|
|
||||||
sqlite.MustRegisterScalarFunction("json_array_contains", 2, jsonArrayContains)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Package is a ALR package's database representation
|
// Package is a ALR package's database representation
|
||||||
type Package struct {
|
type Package struct {
|
||||||
Name string `sh:"name,required" db:"name"`
|
Name string `sh:"name,required" db:"name"`
|
||||||
@ -67,66 +57,46 @@ type version struct {
|
|||||||
Version int `db:"version"`
|
Version int `db:"version"`
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
type Config interface {
|
||||||
mu sync.Mutex
|
GetPaths(ctx context.Context) *config.Paths
|
||||||
|
}
|
||||||
|
|
||||||
|
type Database struct {
|
||||||
conn *sqlx.DB
|
conn *sqlx.DB
|
||||||
closed = true
|
config Config
|
||||||
)
|
}
|
||||||
|
|
||||||
// DB returns the ALR database.
|
func New(config Config) *Database {
|
||||||
// The first time it's called, it opens the SQLite database file.
|
return &Database{
|
||||||
// Subsequent calls return the same connection.
|
config: config,
|
||||||
func DB(ctx context.Context) *sqlx.DB {
|
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
if conn != nil && !closed {
|
|
||||||
return getConn()
|
|
||||||
}
|
}
|
||||||
_, err := open(ctx, config.GetPaths(ctx).DBPath)
|
}
|
||||||
|
|
||||||
|
func (d *Database) Init(ctx context.Context) error {
|
||||||
|
err := d.Connect(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error opening database").Err(err).Send()
|
return err
|
||||||
}
|
}
|
||||||
return getConn()
|
return d.initDB(ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
func getConn() *sqlx.DB {
|
func (d *Database) Connect(ctx context.Context) error {
|
||||||
mu.Lock()
|
dsn := d.config.GetPaths(ctx).DBPath
|
||||||
defer mu.Unlock()
|
|
||||||
return conn
|
|
||||||
}
|
|
||||||
|
|
||||||
func open(ctx context.Context, dsn string) (*sqlx.DB, error) {
|
|
||||||
db, err := sqlx.Open("sqlite", dsn)
|
db, err := sqlx.Open("sqlite", dsn)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return err
|
||||||
}
|
}
|
||||||
|
d.conn = db
|
||||||
mu.Lock()
|
return nil
|
||||||
conn = db
|
|
||||||
closed = false
|
|
||||||
mu.Unlock()
|
|
||||||
|
|
||||||
err = initDB(ctx, dsn)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return db, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close closes the database
|
func (d *Database) GetConn() *sqlx.DB {
|
||||||
func Close() error {
|
return d.conn
|
||||||
closed = true
|
|
||||||
if conn != nil {
|
|
||||||
return conn.Close()
|
|
||||||
} else {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// initDB initializes the database
|
func (d *Database) initDB(ctx context.Context) error {
|
||||||
func initDB(ctx context.Context, dsn string) error {
|
d.conn = d.conn.Unsafe()
|
||||||
log := loggerctx.From(ctx)
|
conn := d.conn
|
||||||
conn = conn.Unsafe()
|
|
||||||
_, err := conn.ExecContext(ctx, `
|
_, err := conn.ExecContext(ctx, `
|
||||||
CREATE TABLE IF NOT EXISTS pkgs (
|
CREATE TABLE IF NOT EXISTS pkgs (
|
||||||
name TEXT NOT NULL,
|
name TEXT NOT NULL,
|
||||||
@ -156,58 +126,72 @@ func initDB(ctx context.Context, dsn string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
ver, ok := GetVersion(ctx)
|
ver, ok := d.GetVersion(ctx)
|
||||||
if ok && ver != CurrentVersion {
|
if ok && ver != CurrentVersion {
|
||||||
log.Warn("Database version mismatch; resetting").Int("version", ver).Int("expected", CurrentVersion).Send()
|
slog.Warn(gotext.Get("Database version mismatch; resetting"), "version", ver, "expected", CurrentVersion)
|
||||||
reset(ctx)
|
d.reset(ctx)
|
||||||
return initDB(ctx, dsn)
|
return d.initDB(ctx)
|
||||||
} else if !ok {
|
} else if !ok {
|
||||||
log.Warn("Database version does not exist. Run alr fix if something isn't working.").Send()
|
slog.Warn(gotext.Get("Database version does not exist. Run alr fix if something isn't working."), "version", ver, "expected", CurrentVersion)
|
||||||
return addVersion(ctx, CurrentVersion)
|
return d.addVersion(ctx, CurrentVersion)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// reset drops all the database tables
|
func (d *Database) GetVersion(ctx context.Context) (int, bool) {
|
||||||
func reset(ctx context.Context) error {
|
|
||||||
_, err := DB(ctx).ExecContext(ctx, "DROP TABLE IF EXISTS pkgs;")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
_, err = DB(ctx).ExecContext(ctx, "DROP TABLE IF EXISTS alr_db_version;")
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsEmpty returns true if the database has no packages in it, otherwise it returns false.
|
|
||||||
func IsEmpty(ctx context.Context) bool {
|
|
||||||
var count int
|
|
||||||
err := DB(ctx).GetContext(ctx, &count, "SELECT count(1) FROM pkgs;")
|
|
||||||
if err != nil {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return count == 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetVersion returns the database version and a boolean indicating
|
|
||||||
// whether the database contained a version number
|
|
||||||
func GetVersion(ctx context.Context) (int, bool) {
|
|
||||||
var ver version
|
var ver version
|
||||||
err := DB(ctx).GetContext(ctx, &ver, "SELECT * FROM alr_db_version LIMIT 1;")
|
err := d.conn.GetContext(ctx, &ver, "SELECT * FROM alr_db_version LIMIT 1;")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, false
|
return 0, false
|
||||||
}
|
}
|
||||||
return ver.Version, true
|
return ver.Version, true
|
||||||
}
|
}
|
||||||
|
|
||||||
func addVersion(ctx context.Context, ver int) error {
|
func (d *Database) addVersion(ctx context.Context, ver int) error {
|
||||||
_, err := DB(ctx).ExecContext(ctx, `INSERT INTO alr_db_version(version) VALUES (?);`, ver)
|
_, err := d.conn.ExecContext(ctx, `INSERT INTO alr_db_version(version) VALUES (?);`, ver)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// InsertPackage adds a package to the database
|
func (d *Database) reset(ctx context.Context) error {
|
||||||
func InsertPackage(ctx context.Context, pkg Package) error {
|
_, err := d.conn.ExecContext(ctx, "DROP TABLE IF EXISTS pkgs;")
|
||||||
_, err := DB(ctx).NamedExecContext(ctx, `
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
_, err = d.conn.ExecContext(ctx, "DROP TABLE IF EXISTS alr_db_version;")
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
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 {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return stream, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Database) GetPkg(ctx context.Context, where string, args ...any) (*Package, error) {
|
||||||
|
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(ctx context.Context) bool {
|
||||||
|
var count int
|
||||||
|
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 (
|
INSERT OR REPLACE INTO pkgs (
|
||||||
name,
|
name,
|
||||||
repository,
|
repository,
|
||||||
@ -247,101 +231,10 @@ func InsertPackage(ctx context.Context, pkg Package) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetPkgs returns a result containing packages that match the where conditions
|
func (d *Database) Close() error {
|
||||||
func GetPkgs(ctx context.Context, where string, args ...any) (*sqlx.Rows, error) {
|
if d.conn != nil {
|
||||||
stream, err := DB(ctx).QueryxContext(ctx, "SELECT * FROM pkgs WHERE "+where, args...)
|
return d.conn.Close()
|
||||||
if err != nil {
|
} else {
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return stream, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPkg returns a single package that matches the where conditions
|
|
||||||
func GetPkg(ctx context.Context, where string, args ...any) (*Package, error) {
|
|
||||||
out := &Package{}
|
|
||||||
err := DB(ctx).GetContext(ctx, out, "SELECT * FROM pkgs WHERE "+where+" LIMIT 1", args...)
|
|
||||||
return out, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// DeletePkgs deletes all packages matching the where conditions
|
|
||||||
func DeletePkgs(ctx context.Context, where string, args ...any) error {
|
|
||||||
_, err := DB(ctx).ExecContext(ctx, "DELETE FROM pkgs WHERE "+where, args...)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// jsonArrayContains is an SQLite function that checks if a JSON array
|
|
||||||
// in the database contains a given value
|
|
||||||
func jsonArrayContains(ctx *sqlite.FunctionContext, args []driver.Value) (driver.Value, error) {
|
|
||||||
value, ok := args[0].(string)
|
|
||||||
if !ok {
|
|
||||||
return nil, errors.New("both arguments to json_array_contains must be strings")
|
|
||||||
}
|
|
||||||
|
|
||||||
item, ok := args[1].(string)
|
|
||||||
if !ok {
|
|
||||||
return nil, errors.New("both arguments to json_array_contains must be strings")
|
|
||||||
}
|
|
||||||
|
|
||||||
var array []string
|
|
||||||
err := json.Unmarshal([]byte(value), &array)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return slices.Contains(array, item), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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
|
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)
|
|
||||||
}
|
}
|
||||||
|
106
internal/db/db_legacy.go
Normal file
106
internal/db/db_legacy.go
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log/slog"
|
||||||
|
"os"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"github.com/jmoiron/sqlx"
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
|
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DB returns the ALR database.
|
||||||
|
// The first time it's called, it opens the SQLite database file.
|
||||||
|
// Subsequent calls return the same connection.
|
||||||
|
//
|
||||||
|
// Deprecated: use struct method
|
||||||
|
func DB(ctx context.Context) *sqlx.DB {
|
||||||
|
return GetInstance(ctx).GetConn()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close closes the database
|
||||||
|
//
|
||||||
|
// Deprecated: use struct method
|
||||||
|
func Close() error {
|
||||||
|
if database != nil {
|
||||||
|
return database.Close()
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsEmpty returns true if the database has no packages in it, otherwise it returns false.
|
||||||
|
//
|
||||||
|
// Deprecated: use struct method
|
||||||
|
func IsEmpty(ctx context.Context) bool {
|
||||||
|
return GetInstance(ctx).IsEmpty(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
// InsertPackage adds a package to the database
|
||||||
|
//
|
||||||
|
// Deprecated: use struct method
|
||||||
|
func InsertPackage(ctx context.Context, pkg Package) error {
|
||||||
|
return GetInstance(ctx).InsertPackage(ctx, pkg)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPkgs returns a result containing packages that match the where conditions
|
||||||
|
//
|
||||||
|
// Deprecated: use struct method
|
||||||
|
func GetPkgs(ctx context.Context, where string, args ...any) (*sqlx.Rows, error) {
|
||||||
|
return GetInstance(ctx).GetPkgs(ctx, where, args...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPkg returns a single package that matches the where conditions
|
||||||
|
//
|
||||||
|
// Deprecated: use struct method
|
||||||
|
func GetPkg(ctx context.Context, where string, args ...any) (*Package, error) {
|
||||||
|
return GetInstance(ctx).GetPkg(ctx, where, args...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeletePkgs deletes all packages matching the where conditions
|
||||||
|
//
|
||||||
|
// Deprecated: use struct method
|
||||||
|
func DeletePkgs(ctx context.Context, where string, args ...any) error {
|
||||||
|
return GetInstance(ctx).DeletePkgs(ctx, where, args...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// =======================
|
||||||
|
// FOR LEGACY ONLY
|
||||||
|
// =======================
|
||||||
|
|
||||||
|
var (
|
||||||
|
dbOnce sync.Once
|
||||||
|
database *Database
|
||||||
|
)
|
||||||
|
|
||||||
|
// Deprecated: For legacy only
|
||||||
|
func GetInstance(ctx context.Context) *Database {
|
||||||
|
dbOnce.Do(func() {
|
||||||
|
cfg := config.GetInstance(ctx)
|
||||||
|
database = New(cfg)
|
||||||
|
err := database.Init(ctx)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error opening database"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return database
|
||||||
|
}
|
@ -1,32 +1,50 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package db_test
|
package db_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/jmoiron/sqlx"
|
"github.com/jmoiron/sqlx"
|
||||||
"plemya-x.ru/alr/internal/db"
|
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type TestALRConfig struct{}
|
||||||
|
|
||||||
|
func (c *TestALRConfig) GetPaths(ctx context.Context) *config.Paths {
|
||||||
|
return &config.Paths{
|
||||||
|
DBPath: ":memory:",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func prepareDb() *db.Database {
|
||||||
|
database := db.New(&TestALRConfig{})
|
||||||
|
database.Init(context.Background())
|
||||||
|
return database
|
||||||
|
}
|
||||||
|
|
||||||
var testPkg = db.Package{
|
var testPkg = db.Package{
|
||||||
Name: "test",
|
Name: "test",
|
||||||
Version: "0.0.1",
|
Version: "0.0.1",
|
||||||
@ -59,18 +77,11 @@ var testPkg = db.Package{
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestInit(t *testing.T) {
|
func TestInit(t *testing.T) {
|
||||||
_, err := db.Open(":memory:")
|
ctx := context.Background()
|
||||||
if err != nil {
|
database := prepareDb()
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
defer database.Close()
|
||||||
}
|
|
||||||
defer db.Close()
|
|
||||||
|
|
||||||
_, err = db.DB().Exec("SELECT * FROM pkgs")
|
ver, ok := database.GetVersion(ctx)
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
ver, ok := db.GetVersion()
|
|
||||||
if !ok {
|
if !ok {
|
||||||
t.Errorf("Expected version to be present")
|
t.Errorf("Expected version to be present")
|
||||||
} else if ver != db.CurrentVersion {
|
} else if ver != db.CurrentVersion {
|
||||||
@ -79,19 +90,17 @@ func TestInit(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestInsertPackage(t *testing.T) {
|
func TestInsertPackage(t *testing.T) {
|
||||||
_, err := db.Open(":memory:")
|
ctx := context.Background()
|
||||||
if err != nil {
|
database := prepareDb()
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
defer database.Close()
|
||||||
}
|
|
||||||
defer db.Close()
|
|
||||||
|
|
||||||
err = db.InsertPackage(testPkg)
|
err := database.InsertPackage(ctx, testPkg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
dbPkg := db.Package{}
|
dbPkg := db.Package{}
|
||||||
err = sqlx.Get(db.DB(), &dbPkg, "SELECT * FROM pkgs WHERE name = 'test' AND repository = 'default'")
|
err = sqlx.Get(database.GetConn(), &dbPkg, "SELECT * FROM pkgs WHERE name = 'test' AND repository = 'default'")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
@ -102,28 +111,26 @@ func TestInsertPackage(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestGetPkgs(t *testing.T) {
|
func TestGetPkgs(t *testing.T) {
|
||||||
_, err := db.Open(":memory:")
|
ctx := context.Background()
|
||||||
if err != nil {
|
database := prepareDb()
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
defer database.Close()
|
||||||
}
|
|
||||||
defer db.Close()
|
|
||||||
|
|
||||||
x1 := testPkg
|
x1 := testPkg
|
||||||
x1.Name = "x1"
|
x1.Name = "x1"
|
||||||
x2 := testPkg
|
x2 := testPkg
|
||||||
x2.Name = "x2"
|
x2.Name = "x2"
|
||||||
|
|
||||||
err = db.InsertPackage(x1)
|
err := database.InsertPackage(ctx, x1)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Expected no error, got %s", err)
|
t.Errorf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = db.InsertPackage(x2)
|
err = database.InsertPackage(ctx, x2)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Expected no error, got %s", err)
|
t.Errorf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
result, err := db.GetPkgs("name LIKE 'x%'")
|
result, err := database.GetPkgs(ctx, "name LIKE 'x%'")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
@ -142,28 +149,26 @@ func TestGetPkgs(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestGetPkg(t *testing.T) {
|
func TestGetPkg(t *testing.T) {
|
||||||
_, err := db.Open(":memory:")
|
ctx := context.Background()
|
||||||
if err != nil {
|
database := prepareDb()
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
defer database.Close()
|
||||||
}
|
|
||||||
defer db.Close()
|
|
||||||
|
|
||||||
x1 := testPkg
|
x1 := testPkg
|
||||||
x1.Name = "x1"
|
x1.Name = "x1"
|
||||||
x2 := testPkg
|
x2 := testPkg
|
||||||
x2.Name = "x2"
|
x2.Name = "x2"
|
||||||
|
|
||||||
err = db.InsertPackage(x1)
|
err := database.InsertPackage(ctx, x1)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Expected no error, got %s", err)
|
t.Errorf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = db.InsertPackage(x2)
|
err = database.InsertPackage(ctx, x2)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Expected no error, got %s", err)
|
t.Errorf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
pkg, err := db.GetPkg("name LIKE 'x%' ORDER BY name")
|
pkg, err := database.GetPkg(ctx, "name LIKE 'x%' ORDER BY name")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
@ -178,34 +183,32 @@ func TestGetPkg(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestDeletePkgs(t *testing.T) {
|
func TestDeletePkgs(t *testing.T) {
|
||||||
_, err := db.Open(":memory:")
|
ctx := context.Background()
|
||||||
if err != nil {
|
database := prepareDb()
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
defer database.Close()
|
||||||
}
|
|
||||||
defer db.Close()
|
|
||||||
|
|
||||||
x1 := testPkg
|
x1 := testPkg
|
||||||
x1.Name = "x1"
|
x1.Name = "x1"
|
||||||
x2 := testPkg
|
x2 := testPkg
|
||||||
x2.Name = "x2"
|
x2.Name = "x2"
|
||||||
|
|
||||||
err = db.InsertPackage(x1)
|
err := database.InsertPackage(ctx, x1)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Expected no error, got %s", err)
|
t.Errorf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = db.InsertPackage(x2)
|
err = database.InsertPackage(ctx, x2)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Expected no error, got %s", err)
|
t.Errorf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = db.DeletePkgs("name = 'x1'")
|
err = database.DeletePkgs(ctx, "name = 'x1'")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Expected no error, got %s", err)
|
t.Errorf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var dbPkg db.Package
|
var dbPkg db.Package
|
||||||
err = db.DB().Get(&dbPkg, "SELECT * FROM pkgs WHERE name LIKE 'x%' ORDER BY name LIMIT 1;")
|
err = database.GetConn().Get(&dbPkg, "SELECT * FROM pkgs WHERE name LIKE 'x%' ORDER BY name LIMIT 1;")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Expected no error, got %s", err)
|
t.Errorf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
@ -216,11 +219,9 @@ func TestDeletePkgs(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestJsonArrayContains(t *testing.T) {
|
func TestJsonArrayContains(t *testing.T) {
|
||||||
_, err := db.Open(":memory:")
|
ctx := context.Background()
|
||||||
if err != nil {
|
database := prepareDb()
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
defer database.Close()
|
||||||
}
|
|
||||||
defer db.Close()
|
|
||||||
|
|
||||||
x1 := testPkg
|
x1 := testPkg
|
||||||
x1.Name = "x1"
|
x1.Name = "x1"
|
||||||
@ -228,18 +229,18 @@ func TestJsonArrayContains(t *testing.T) {
|
|||||||
x2.Name = "x2"
|
x2.Name = "x2"
|
||||||
x2.Provides.Val = append(x2.Provides.Val, "x")
|
x2.Provides.Val = append(x2.Provides.Val, "x")
|
||||||
|
|
||||||
err = db.InsertPackage(x1)
|
err := database.InsertPackage(ctx, x1)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Expected no error, got %s", err)
|
t.Errorf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = db.InsertPackage(x2)
|
err = database.InsertPackage(ctx, x2)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Expected no error, got %s", err)
|
t.Errorf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var dbPkg db.Package
|
var dbPkg db.Package
|
||||||
err = db.DB().Get(&dbPkg, "SELECT * FROM pkgs WHERE json_array_contains(provides, 'x');")
|
err = database.GetConn().Get(&dbPkg, "SELECT * FROM pkgs WHERE json_array_contains(provides, 'x');")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
80
internal/db/json.go
Normal file
80
internal/db/json.go
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"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)
|
||||||
|
}
|
52
internal/db/utils.go
Normal file
52
internal/db/utils.go
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql/driver"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
|
||||||
|
"golang.org/x/exp/slices"
|
||||||
|
"modernc.org/sqlite"
|
||||||
|
)
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
sqlite.MustRegisterScalarFunction("json_array_contains", 2, jsonArrayContains)
|
||||||
|
}
|
||||||
|
|
||||||
|
// jsonArrayContains is an SQLite function that checks if a JSON array
|
||||||
|
// in the database contains a given value
|
||||||
|
func jsonArrayContains(ctx *sqlite.FunctionContext, args []driver.Value) (driver.Value, error) {
|
||||||
|
value, ok := args[0].(string)
|
||||||
|
if !ok {
|
||||||
|
return nil, errors.New("both arguments to json_array_contains must be strings")
|
||||||
|
}
|
||||||
|
|
||||||
|
item, ok := args[1].(string)
|
||||||
|
if !ok {
|
||||||
|
return nil, errors.New("both arguments to json_array_contains must be strings")
|
||||||
|
}
|
||||||
|
|
||||||
|
var array []string
|
||||||
|
err := json.Unmarshal([]byte(value), &array)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return slices.Contains(array, item), nil
|
||||||
|
}
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
// Пакет dl содержит абстракции для загрузки файлов и каталогов
|
// Пакет dl содержит абстракции для загрузки файлов и каталогов
|
||||||
// из различных источников.
|
// из различных источников.
|
||||||
@ -30,18 +31,20 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"hash"
|
"hash"
|
||||||
"io"
|
"io"
|
||||||
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/PuerkitoBio/purell"
|
"github.com/PuerkitoBio/purell"
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
"github.com/vmihailenco/msgpack/v5"
|
"github.com/vmihailenco/msgpack/v5"
|
||||||
"golang.org/x/crypto/blake2b"
|
"golang.org/x/crypto/blake2b"
|
||||||
"golang.org/x/crypto/blake2s"
|
"golang.org/x/crypto/blake2s"
|
||||||
"golang.org/x/exp/slices"
|
"golang.org/x/exp/slices"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/dlcache"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/dlcache"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Константа для имени файла манифеста кэша
|
// Константа для имени файла манифеста кэша
|
||||||
@ -142,7 +145,9 @@ type UpdatingDownloader interface {
|
|||||||
|
|
||||||
// Функция Download загружает файл или каталог с использованием указанных параметров
|
// Функция Download загружает файл или каталог с использованием указанных параметров
|
||||||
func Download(ctx context.Context, opts Options) (err error) {
|
func Download(ctx context.Context, opts Options) (err error) {
|
||||||
log := loggerctx.From(ctx)
|
cfg := config.GetInstance(ctx)
|
||||||
|
dc := dlcache.New(cfg)
|
||||||
|
|
||||||
normalized, err := normalizeURL(opts.URL)
|
normalized, err := normalizeURL(opts.URL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -157,11 +162,15 @@ func Download(ctx context.Context, opts Options) (err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var t Type
|
var t Type
|
||||||
cacheDir, ok := dlcache.Get(ctx, opts.URL)
|
cacheDir, ok := dc.Get(ctx, opts.URL)
|
||||||
if ok {
|
if ok {
|
||||||
var updated bool
|
var updated bool
|
||||||
if d, ok := d.(UpdatingDownloader); ok {
|
if d, ok := d.(UpdatingDownloader); ok {
|
||||||
log.Info("Source can be updated, updating if required").Str("source", opts.Name).Str("downloader", d.Name()).Send()
|
slog.Info(
|
||||||
|
gotext.Get("Source can be updated, updating if required"),
|
||||||
|
"source", opts.Name,
|
||||||
|
"downloader", d.Name(),
|
||||||
|
)
|
||||||
|
|
||||||
updated, err = d.Update(Options{
|
updated, err = d.Update(Options{
|
||||||
Hash: opts.Hash,
|
Hash: opts.Hash,
|
||||||
@ -188,10 +197,18 @@ func Download(ctx context.Context, opts Options) (err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ok && !updated {
|
if ok && !updated {
|
||||||
log.Info("Source found in cache and linked to destination").Str("source", opts.Name).Stringer("type", t).Send()
|
slog.Info(
|
||||||
|
gotext.Get("Source found in cache and linked to destination"),
|
||||||
|
"source", opts.Name,
|
||||||
|
"type", t,
|
||||||
|
)
|
||||||
return nil
|
return nil
|
||||||
} else if ok {
|
} else if ok {
|
||||||
log.Info("Source updated and linked to destination").Str("source", opts.Name).Stringer("type", t).Send()
|
slog.Info(
|
||||||
|
gotext.Get("Source updated and linked to destination"),
|
||||||
|
"source", opts.Name,
|
||||||
|
"type", t,
|
||||||
|
)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -202,9 +219,9 @@ func Download(ctx context.Context, opts Options) (err error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Info("Downloading source").Str("source", opts.Name).Str("downloader", d.Name()).Send()
|
slog.Info(gotext.Get("Downloading source"), "source", opts.Name, "downloader", d.Name())
|
||||||
|
|
||||||
cacheDir, err = dlcache.New(ctx, opts.URL)
|
cacheDir, err = dc.New(ctx, opts.URL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package dl
|
package dl
|
||||||
|
|
||||||
@ -34,7 +35,7 @@ import (
|
|||||||
"github.com/mholt/archiver/v4"
|
"github.com/mholt/archiver/v4"
|
||||||
"github.com/schollz/progressbar/v3"
|
"github.com/schollz/progressbar/v3"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/shutils/handlers"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
|
||||||
)
|
)
|
||||||
|
|
||||||
// FileDownloader загружает файлы с использованием HTTP
|
// FileDownloader загружает файлы с использованием HTTP
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package dl
|
package dl
|
||||||
|
|
||||||
|
@ -1,3 +1,22 @@
|
|||||||
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
|
//
|
||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package dl
|
package dl
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
@ -1,48 +1,61 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package dlcache
|
package dlcache
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"crypto/sha1"
|
|
||||||
"encoding/hex"
|
|
||||||
"io"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
)
|
)
|
||||||
|
|
||||||
// BasePath returns the base path of the download cache
|
type Config interface {
|
||||||
func BasePath(ctx context.Context) string {
|
GetPaths(ctx context.Context) *config.Paths
|
||||||
return filepath.Join(config.GetPaths(ctx).CacheDir, "dl")
|
}
|
||||||
|
|
||||||
|
type DownloadCache struct {
|
||||||
|
cfg Config
|
||||||
|
}
|
||||||
|
|
||||||
|
func New(cfg Config) *DownloadCache {
|
||||||
|
return &DownloadCache{
|
||||||
|
cfg,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (dc *DownloadCache) BasePath(ctx context.Context) string {
|
||||||
|
return filepath.Join(
|
||||||
|
dc.cfg.GetPaths(ctx).CacheDir, "dl",
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// New creates a new directory with the given ID in the cache.
|
// New creates a new directory with the given ID in the cache.
|
||||||
// If a directory with the same ID already exists,
|
// If a directory with the same ID already exists,
|
||||||
// it will be deleted before creating a new one.
|
// it will be deleted before creating a new one.
|
||||||
func New(ctx context.Context, id string) (string, error) {
|
func (dc *DownloadCache) New(ctx context.Context, id string) (string, error) {
|
||||||
h, err := hashID(id)
|
h, err := hashID(id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
itemPath := filepath.Join(BasePath(ctx), h)
|
itemPath := filepath.Join(dc.BasePath(ctx), h)
|
||||||
|
|
||||||
fi, err := os.Stat(itemPath)
|
fi, err := os.Stat(itemPath)
|
||||||
if err == nil || (fi != nil && !fi.IsDir()) {
|
if err == nil || (fi != nil && !fi.IsDir()) {
|
||||||
@ -65,12 +78,12 @@ func New(ctx context.Context, id string) (string, error) {
|
|||||||
// returns the directory and true. If it
|
// returns the directory and true. If it
|
||||||
// does not exist, it returns an empty string
|
// does not exist, it returns an empty string
|
||||||
// and false.
|
// and false.
|
||||||
func Get(ctx context.Context, id string) (string, bool) {
|
func (dc *DownloadCache) Get(ctx context.Context, id string) (string, bool) {
|
||||||
h, err := hashID(id)
|
h, err := hashID(id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
itemPath := filepath.Join(BasePath(ctx), h)
|
itemPath := filepath.Join(dc.BasePath(ctx), h)
|
||||||
|
|
||||||
_, err = os.Stat(itemPath)
|
_, err = os.Stat(itemPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -79,15 +92,3 @@ func Get(ctx context.Context, id string) (string, bool) {
|
|||||||
|
|
||||||
return itemPath, true
|
return itemPath, true
|
||||||
}
|
}
|
||||||
|
|
||||||
// hashID hashes the input ID with SHA1
|
|
||||||
// and returns the hex string of the hashed
|
|
||||||
// ID.
|
|
||||||
func hashID(id string) (string, error) {
|
|
||||||
h := sha1.New()
|
|
||||||
_, err := io.WriteString(h, id)
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
return hex.EncodeToString(h.Sum(nil)), nil
|
|
||||||
}
|
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package dlcache_test
|
package dlcache_test
|
||||||
|
|
||||||
@ -27,8 +28,8 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/internal/dlcache"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/dlcache"
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
@ -39,14 +40,49 @@ func init() {
|
|||||||
config.GetPaths(context.Background()).RepoDir = dir
|
config.GetPaths(context.Background()).RepoDir = dir
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type TestALRConfig struct {
|
||||||
|
CacheDir string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *TestALRConfig) GetPaths(ctx context.Context) *config.Paths {
|
||||||
|
return &config.Paths{
|
||||||
|
CacheDir: c.CacheDir,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func prepare(t *testing.T) *TestALRConfig {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
dir, err := os.MkdirTemp("/tmp", "alr-dlcache-test.*")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return &TestALRConfig{
|
||||||
|
CacheDir: dir,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func cleanup(t *testing.T, cfg *TestALRConfig) {
|
||||||
|
t.Helper()
|
||||||
|
os.Remove(cfg.CacheDir)
|
||||||
|
}
|
||||||
|
|
||||||
func TestNew(t *testing.T) {
|
func TestNew(t *testing.T) {
|
||||||
|
cfg := prepare(t)
|
||||||
|
defer cleanup(t, cfg)
|
||||||
|
|
||||||
|
dc := dlcache.New(cfg)
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
const id = "https://example.com"
|
const id = "https://example.com"
|
||||||
dir, err := dlcache.New(id)
|
dir, err := dc.New(ctx, id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Errorf("Expected no error, got %s", err)
|
t.Errorf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
exp := filepath.Join(dlcache.BasePath(), sha1sum(id))
|
exp := filepath.Join(dc.BasePath(ctx), sha1sum(id))
|
||||||
if dir != exp {
|
if dir != exp {
|
||||||
t.Errorf("Expected %s, got %s", exp, dir)
|
t.Errorf("Expected %s, got %s", exp, dir)
|
||||||
}
|
}
|
||||||
@ -60,7 +96,7 @@ func TestNew(t *testing.T) {
|
|||||||
t.Errorf("Expected cache item to be a directory")
|
t.Errorf("Expected cache item to be a directory")
|
||||||
}
|
}
|
||||||
|
|
||||||
dir2, ok := dlcache.Get(id)
|
dir2, ok := dc.Get(ctx, id)
|
||||||
if !ok {
|
if !ok {
|
||||||
t.Errorf("Expected Get() to return valid value")
|
t.Errorf("Expected Get() to return valid value")
|
||||||
}
|
}
|
||||||
|
32
internal/dlcache/utils.go
Normal file
32
internal/dlcache/utils.go
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package dlcache
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/sha1"
|
||||||
|
"encoding/hex"
|
||||||
|
"io"
|
||||||
|
)
|
||||||
|
|
||||||
|
func hashID(id string) (string, error) {
|
||||||
|
h := sha1.New()
|
||||||
|
_, err := io.WriteString(h, id)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return hex.EncodeToString(h.Sum(nil)), nil
|
||||||
|
}
|
96
internal/logger/log.go
Normal file
96
internal/logger/log.go
Normal file
@ -0,0 +1,96 @@
|
|||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package logger
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log/slog"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/charmbracelet/lipgloss"
|
||||||
|
"github.com/charmbracelet/log"
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Logger struct {
|
||||||
|
lOut slog.Handler
|
||||||
|
lErr slog.Handler
|
||||||
|
}
|
||||||
|
|
||||||
|
func setupOutLogger() *log.Logger {
|
||||||
|
styles := log.DefaultStyles()
|
||||||
|
logger := log.New(os.Stdout)
|
||||||
|
styles.Levels[log.InfoLevel] = lipgloss.NewStyle().
|
||||||
|
SetString("-->").
|
||||||
|
Foreground(lipgloss.Color("35"))
|
||||||
|
logger.SetStyles(styles)
|
||||||
|
return logger
|
||||||
|
}
|
||||||
|
|
||||||
|
func setupErrorLogger() *log.Logger {
|
||||||
|
styles := log.DefaultStyles()
|
||||||
|
styles.Levels[log.ErrorLevel] = lipgloss.NewStyle().
|
||||||
|
SetString(gotext.Get("ERROR")).
|
||||||
|
Padding(0, 1, 0, 1).
|
||||||
|
Background(lipgloss.Color("204")).
|
||||||
|
Foreground(lipgloss.Color("0"))
|
||||||
|
logger := log.New(os.Stderr)
|
||||||
|
logger.SetStyles(styles)
|
||||||
|
return logger
|
||||||
|
}
|
||||||
|
|
||||||
|
func New() *Logger {
|
||||||
|
standardLogger := setupOutLogger()
|
||||||
|
errLogger := setupErrorLogger()
|
||||||
|
return &Logger{
|
||||||
|
lOut: standardLogger,
|
||||||
|
lErr: errLogger,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) Enabled(ctx context.Context, level slog.Level) bool {
|
||||||
|
if level <= slog.LevelInfo {
|
||||||
|
return l.lOut.Enabled(ctx, level)
|
||||||
|
}
|
||||||
|
return l.lErr.Enabled(ctx, level)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) Handle(ctx context.Context, rec slog.Record) error {
|
||||||
|
if rec.Level <= slog.LevelInfo {
|
||||||
|
return l.lOut.Handle(ctx, rec)
|
||||||
|
}
|
||||||
|
return l.lErr.Handle(ctx, rec)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) WithAttrs(attrs []slog.Attr) slog.Handler {
|
||||||
|
sl := *l
|
||||||
|
sl.lOut = l.lOut.WithAttrs(attrs)
|
||||||
|
sl.lErr = l.lErr.WithAttrs(attrs)
|
||||||
|
return &sl
|
||||||
|
}
|
||||||
|
|
||||||
|
func (l *Logger) WithGroup(name string) slog.Handler {
|
||||||
|
sl := *l
|
||||||
|
sl.lOut = l.lOut.WithGroup(name)
|
||||||
|
sl.lErr = l.lErr.WithGroup(name)
|
||||||
|
return &sl
|
||||||
|
}
|
||||||
|
|
||||||
|
func SetupDefault() {
|
||||||
|
logger := slog.New(New())
|
||||||
|
slog.SetDefault(logger)
|
||||||
|
}
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package osutils
|
package osutils
|
||||||
|
|
||||||
|
@ -1,33 +1,36 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package overrides
|
package overrides
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"reflect"
|
"reflect"
|
||||||
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"golang.org/x/exp/slices"
|
"golang.org/x/exp/slices"
|
||||||
"golang.org/x/text/language"
|
"golang.org/x/text/language"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/cpu"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu"
|
||||||
"plemya-x.ru/alr/internal/db"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
"plemya-x.ru/alr/pkg/distro"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Opts struct {
|
type Opts struct {
|
||||||
@ -222,3 +225,19 @@ func parseLangs(langs []string, tags []language.Tag) ([]string, error) {
|
|||||||
out = slices.Compact(out)
|
out = slices.Compact(out)
|
||||||
return out, nil
|
return out, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func ReleasePlatformSpecific(release int, info *distro.OSRelease) string {
|
||||||
|
if info.ID == "altlinux" {
|
||||||
|
return fmt.Sprintf("alt%d", release)
|
||||||
|
}
|
||||||
|
|
||||||
|
if info.ID == "fedora" || slices.Contains(info.Like, "fedora") {
|
||||||
|
re := regexp.MustCompile(`platform:(\S+)`)
|
||||||
|
match := re.FindStringSubmatch(info.PlatformID)
|
||||||
|
if len(match) > 1 {
|
||||||
|
return fmt.Sprintf("%d.%s", release, match[1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return fmt.Sprintf("%d", release)
|
||||||
|
}
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package overrides_test
|
package overrides_test
|
||||||
|
|
||||||
@ -23,9 +24,11 @@ import (
|
|||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/overrides"
|
"github.com/stretchr/testify/assert"
|
||||||
"plemya-x.ru/alr/pkg/distro"
|
|
||||||
"golang.org/x/text/language"
|
"golang.org/x/text/language"
|
||||||
|
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
|
||||||
)
|
)
|
||||||
|
|
||||||
var info = &distro.OSRelease{
|
var info = &distro.OSRelease{
|
||||||
@ -193,3 +196,43 @@ func TestResolveLangs(t *testing.T) {
|
|||||||
t.Errorf("expected %v, got %v", expected, names)
|
t.Errorf("expected %v, got %v", expected, names)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestReleasePlatformSpecific(t *testing.T) {
|
||||||
|
|
||||||
|
type testCase struct {
|
||||||
|
info *distro.OSRelease
|
||||||
|
expected string
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range []testCase{
|
||||||
|
{
|
||||||
|
info: &distro.OSRelease{
|
||||||
|
ID: "centos",
|
||||||
|
Like: []string{"rhel", "fedora"},
|
||||||
|
PlatformID: "platform:el8",
|
||||||
|
},
|
||||||
|
expected: "1.el8",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
info: &distro.OSRelease{
|
||||||
|
ID: "fedora",
|
||||||
|
PlatformID: "platform:f42",
|
||||||
|
},
|
||||||
|
expected: "1.f42",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
info: &distro.OSRelease{
|
||||||
|
ID: "altlinux",
|
||||||
|
},
|
||||||
|
expected: "alt1",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
info: &distro.OSRelease{
|
||||||
|
ID: "ubuntu",
|
||||||
|
},
|
||||||
|
expected: "1",
|
||||||
|
},
|
||||||
|
} {
|
||||||
|
assert.Equal(t, tc.expected, overrides.ReleasePlatformSpecific(1, tc.info))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package pager
|
package pager
|
||||||
|
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package pager
|
package pager
|
||||||
|
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package decoder
|
package decoder
|
||||||
|
|
||||||
@ -30,8 +31,8 @@ import (
|
|||||||
"mvdan.cc/sh/v3/interp"
|
"mvdan.cc/sh/v3/interp"
|
||||||
"mvdan.cc/sh/v3/syntax"
|
"mvdan.cc/sh/v3/syntax"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/overrides"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
|
||||||
"plemya-x.ru/alr/pkg/distro"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
|
||||||
)
|
)
|
||||||
|
|
||||||
var ErrNotPointerToStruct = errors.New("val must be a pointer to a struct")
|
var ErrNotPointerToStruct = errors.New("val must be a pointer to a struct")
|
||||||
@ -176,7 +177,35 @@ func (d *Decoder) GetFunc(name string) (ScriptFunc, bool) {
|
|||||||
return func(ctx context.Context, opts ...interp.RunnerOption) error {
|
return func(ctx context.Context, opts ...interp.RunnerOption) error {
|
||||||
sub := d.Runner.Subshell()
|
sub := d.Runner.Subshell()
|
||||||
for _, opt := range opts {
|
for _, opt := range opts {
|
||||||
opt(sub)
|
err := opt(sub)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return sub.Run(ctx, fn)
|
||||||
|
}, true
|
||||||
|
}
|
||||||
|
|
||||||
|
type PrepareFunc func(context.Context, *interp.Runner) error
|
||||||
|
|
||||||
|
func (d *Decoder) GetFuncP(name string, prepare PrepareFunc) (ScriptFunc, bool) {
|
||||||
|
fn := d.getFunc(name)
|
||||||
|
if fn == nil {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
|
||||||
|
return func(ctx context.Context, opts ...interp.RunnerOption) error {
|
||||||
|
sub := d.Runner.Subshell()
|
||||||
|
for _, opt := range opts {
|
||||||
|
err := opt(sub)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if prepare != nil {
|
||||||
|
if err := prepare(ctx, sub); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return sub.Run(ctx, fn)
|
return sub.Run(ctx, fn)
|
||||||
}, true
|
}, true
|
||||||
@ -222,3 +251,8 @@ func (d *Decoder) getVar(name string) *expand.Variable {
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func IsTruthy(value string) bool {
|
||||||
|
value = strings.ToLower(strings.TrimSpace(value))
|
||||||
|
return value == "true" || value == "yes" || value == "1"
|
||||||
|
}
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package decoder_test
|
package decoder_test
|
||||||
|
|
||||||
@ -27,10 +28,11 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/shutils/decoder"
|
|
||||||
"plemya-x.ru/alr/pkg/distro"
|
|
||||||
"mvdan.cc/sh/v3/interp"
|
"mvdan.cc/sh/v3/interp"
|
||||||
"mvdan.cc/sh/v3/syntax"
|
"mvdan.cc/sh/v3/syntax"
|
||||||
|
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder"
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
|
||||||
)
|
)
|
||||||
|
|
||||||
type BuildVars struct {
|
type BuildVars struct {
|
||||||
@ -56,7 +58,7 @@ const testScript = `
|
|||||||
release=1
|
release=1
|
||||||
epoch=2
|
epoch=2
|
||||||
desc="Test package"
|
desc="Test package"
|
||||||
homepage='//https://gitea.plemya-x.ru/xpamych/ALR'
|
homepage='https://gitea.plemya-x.ru/xpamych/ALR'
|
||||||
maintainer='Евгений Храмов <xpamych@yandex.ru>'
|
maintainer='Евгений Храмов <xpamych@yandex.ru>'
|
||||||
architectures=('arm64' 'amd64')
|
architectures=('arm64' 'amd64')
|
||||||
license=('GPL-3.0-or-later')
|
license=('GPL-3.0-or-later')
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package handlers
|
package handlers
|
||||||
|
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package handlers_test
|
package handlers_test
|
||||||
|
|
||||||
@ -23,11 +24,12 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/shutils/handlers"
|
|
||||||
"plemya-x.ru/alr/internal/shutils/decoder"
|
|
||||||
"plemya-x.ru/alr/pkg/distro"
|
|
||||||
"mvdan.cc/sh/v3/interp"
|
"mvdan.cc/sh/v3/interp"
|
||||||
"mvdan.cc/sh/v3/syntax"
|
"mvdan.cc/sh/v3/syntax"
|
||||||
|
|
||||||
|
"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/pkg/distro"
|
||||||
)
|
)
|
||||||
|
|
||||||
const testScript = `
|
const testScript = `
|
||||||
@ -89,7 +91,7 @@ func TestExecFuncs(t *testing.T) {
|
|||||||
t.Fatalf("Expected test() function to exist")
|
t.Fatalf("Expected test() function to exist")
|
||||||
}
|
}
|
||||||
|
|
||||||
eh := shutils.ExecFuncs{
|
eh := handlers.ExecFuncs{
|
||||||
"test-cmd": func(hc interp.HandlerContext, name string, args []string) error {
|
"test-cmd": func(hc interp.HandlerContext, name string, args []string) error {
|
||||||
if name != "test-cmd" {
|
if name != "test-cmd" {
|
||||||
t.Errorf("Expected name to be 'test-cmd', got '%s'", name)
|
t.Errorf("Expected name to be 'test-cmd', got '%s'", name)
|
||||||
|
@ -1,3 +1,22 @@
|
|||||||
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
|
//
|
||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package handlers
|
package handlers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package handlers
|
package handlers
|
||||||
|
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package handlers_test
|
package handlers_test
|
||||||
|
|
||||||
@ -25,9 +26,10 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/shutils/handlers"
|
|
||||||
"mvdan.cc/sh/v3/interp"
|
"mvdan.cc/sh/v3/interp"
|
||||||
"mvdan.cc/sh/v3/syntax"
|
"mvdan.cc/sh/v3/syntax"
|
||||||
|
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestNopExec(t *testing.T) {
|
func TestNopExec(t *testing.T) {
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package handlers
|
package handlers
|
||||||
|
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package helpers
|
package helpers
|
||||||
|
|
||||||
@ -23,6 +24,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
|
"path"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
@ -33,7 +35,7 @@ import (
|
|||||||
"golang.org/x/exp/slices"
|
"golang.org/x/exp/slices"
|
||||||
"mvdan.cc/sh/v3/interp"
|
"mvdan.cc/sh/v3/interp"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/shutils/handlers"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -54,12 +56,17 @@ var Helpers = handlers.ExecFuncs{
|
|||||||
"install-completion": installCompletionCmd,
|
"install-completion": installCompletionCmd,
|
||||||
"install-library": installLibraryCmd,
|
"install-library": installLibraryCmd,
|
||||||
"git-version": gitVersionCmd,
|
"git-version": gitVersionCmd,
|
||||||
|
|
||||||
|
"files-find-lang": filesFindLangCmd,
|
||||||
|
"files-find-doc": filesFindDocCmd,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Restricted contains restricted read-only helper commands
|
// Restricted contains restricted read-only helper commands
|
||||||
// that don't modify any state
|
// that don't modify any state
|
||||||
var Restricted = handlers.ExecFuncs{
|
var Restricted = handlers.ExecFuncs{
|
||||||
"git-version": gitVersionCmd,
|
"git-version": gitVersionCmd,
|
||||||
|
"files-find-lang": filesFindLangCmd,
|
||||||
|
"files-find-doc": filesFindDocCmd,
|
||||||
}
|
}
|
||||||
|
|
||||||
func installHelperCmd(prefix string, perms os.FileMode) handlers.ExecFunc {
|
func installHelperCmd(prefix string, perms os.FileMode) handlers.ExecFunc {
|
||||||
@ -255,6 +262,114 @@ func gitVersionCmd(hc interp.HandlerContext, cmd string, args []string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func filesFindLangCmd(hc interp.HandlerContext, cmd string, args []string) error {
|
||||||
|
namePattern := "*.mo"
|
||||||
|
if len(args) > 0 {
|
||||||
|
namePattern = args[0] + ".mo"
|
||||||
|
}
|
||||||
|
|
||||||
|
localePath := "./usr/share/locale/"
|
||||||
|
realPath := path.Join(hc.Dir, localePath)
|
||||||
|
|
||||||
|
info, err := os.Stat(realPath)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("files-find-lang: %w", err)
|
||||||
|
}
|
||||||
|
if !info.IsDir() {
|
||||||
|
return fmt.Errorf("files-find-lang: %s is not a directory", localePath)
|
||||||
|
}
|
||||||
|
|
||||||
|
var langFiles []string
|
||||||
|
err = filepath.Walk(realPath, func(p string, info os.FileInfo, err error) error {
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !info.IsDir() && matchNamePattern(info.Name(), namePattern) {
|
||||||
|
relPath, relErr := filepath.Rel(hc.Dir, p)
|
||||||
|
if relErr != nil {
|
||||||
|
return relErr
|
||||||
|
}
|
||||||
|
langFiles = append(langFiles, "./"+relPath)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("files-find-lang: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, file := range langFiles {
|
||||||
|
fmt.Fprintln(hc.Stdout, file)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func filesFindDocCmd(hc interp.HandlerContext, cmd string, args []string) error {
|
||||||
|
namePattern := "*"
|
||||||
|
if len(args) > 0 {
|
||||||
|
namePattern = args[0]
|
||||||
|
}
|
||||||
|
|
||||||
|
docPath := "./usr/share/doc/"
|
||||||
|
docRealPath := path.Join(hc.Dir, docPath)
|
||||||
|
|
||||||
|
info, err := os.Stat(docRealPath)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("files-find-doc: %w", err)
|
||||||
|
}
|
||||||
|
if !info.IsDir() {
|
||||||
|
return fmt.Errorf("files-find-doc: %s is not a directory", docPath)
|
||||||
|
}
|
||||||
|
|
||||||
|
var docFiles []string
|
||||||
|
|
||||||
|
entries, err := os.ReadDir(docRealPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, entry := range entries {
|
||||||
|
if matchNamePattern(entry.Name(), namePattern) {
|
||||||
|
targetPath := filepath.Join(docRealPath, entry.Name())
|
||||||
|
targetInfo, err := os.Stat(targetPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if targetInfo.IsDir() {
|
||||||
|
err := filepath.Walk(targetPath, func(subPath string, subInfo os.FileInfo, subErr error) error {
|
||||||
|
relPath, err := filepath.Rel(hc.Dir, subPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
docFiles = append(docFiles, "./"+relPath)
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("files-find-doc: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, file := range docFiles {
|
||||||
|
fmt.Fprintln(hc.Stdout, file)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func matchNamePattern(name, pattern string) bool {
|
||||||
|
matched, err := filepath.Match(pattern, name)
|
||||||
|
if err != nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return matched
|
||||||
|
}
|
||||||
|
|
||||||
func helperInstall(from, to string, perms os.FileMode) error {
|
func helperInstall(from, to string, perms os.FileMode) error {
|
||||||
err := os.MkdirAll(filepath.Dir(to), 0o755)
|
err := os.MkdirAll(filepath.Dir(to), 0o755)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
216
internal/shutils/helpers/helpers_internal_test.go
Normal file
216
internal/shutils/helpers/helpers_internal_test.go
Normal file
@ -0,0 +1,216 @@
|
|||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package helpers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"mvdan.cc/sh/v3/interp"
|
||||||
|
"mvdan.cc/sh/v3/syntax"
|
||||||
|
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
|
||||||
|
)
|
||||||
|
|
||||||
|
type testCase struct {
|
||||||
|
name string
|
||||||
|
dirsToCreate []string
|
||||||
|
filesToCreate []string
|
||||||
|
expectedOutput []string
|
||||||
|
args string
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFindFilesDoc(t *testing.T) {
|
||||||
|
tests := []testCase{
|
||||||
|
{
|
||||||
|
name: "All dirs",
|
||||||
|
dirsToCreate: []string{
|
||||||
|
"usr/share/doc/yandex-browser-stable/subdir",
|
||||||
|
"usr/share/doc/firefox",
|
||||||
|
},
|
||||||
|
filesToCreate: []string{
|
||||||
|
"usr/share/doc/yandex-browser-stable/README.md",
|
||||||
|
"usr/share/doc/yandex-browser-stable/subdir/nested-file.txt",
|
||||||
|
"usr/share/doc/firefox/README.md",
|
||||||
|
},
|
||||||
|
expectedOutput: []string{
|
||||||
|
"./usr/share/doc/yandex-browser-stable",
|
||||||
|
"./usr/share/doc/yandex-browser-stable/README.md",
|
||||||
|
"./usr/share/doc/yandex-browser-stable/subdir",
|
||||||
|
"./usr/share/doc/yandex-browser-stable/subdir/nested-file.txt",
|
||||||
|
"./usr/share/doc/firefox",
|
||||||
|
"./usr/share/doc/firefox/README.md",
|
||||||
|
},
|
||||||
|
args: "",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Only selected dir",
|
||||||
|
dirsToCreate: []string{
|
||||||
|
"usr/share/doc/yandex-browser-stable/subdir",
|
||||||
|
"usr/share/doc/firefox",
|
||||||
|
"usr/share/doc/foo/yandex-browser-stable",
|
||||||
|
},
|
||||||
|
filesToCreate: []string{
|
||||||
|
"usr/share/doc/yandex-browser-stable/README.md",
|
||||||
|
"usr/share/doc/yandex-browser-stable/subdir/nested-file.txt",
|
||||||
|
"usr/share/doc/firefox/README.md",
|
||||||
|
"usr/share/doc/firefox/yandex-browser-stable",
|
||||||
|
"usr/share/doc/foo/yandex-browser-stable/README.md",
|
||||||
|
},
|
||||||
|
expectedOutput: []string{
|
||||||
|
"./usr/share/doc/yandex-browser-stable",
|
||||||
|
"./usr/share/doc/yandex-browser-stable/README.md",
|
||||||
|
"./usr/share/doc/yandex-browser-stable/subdir",
|
||||||
|
"./usr/share/doc/yandex-browser-stable/subdir/nested-file.txt",
|
||||||
|
},
|
||||||
|
args: "yandex-browser-stable",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
tempDir, err := os.MkdirTemp("", "test-files-find-doc")
|
||||||
|
assert.NoError(t, err)
|
||||||
|
defer os.RemoveAll(tempDir)
|
||||||
|
|
||||||
|
for _, dir := range tc.dirsToCreate {
|
||||||
|
dirPath := filepath.Join(tempDir, dir)
|
||||||
|
err := os.MkdirAll(dirPath, 0o755)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, file := range tc.filesToCreate {
|
||||||
|
filePath := filepath.Join(tempDir, file)
|
||||||
|
err := os.WriteFile(filePath, []byte("test content"), 0o644)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
helpers := handlers.ExecFuncs{
|
||||||
|
"files-find-doc": filesFindDocCmd,
|
||||||
|
}
|
||||||
|
buf := &bytes.Buffer{}
|
||||||
|
runner, err := interp.New(
|
||||||
|
interp.Dir(tempDir),
|
||||||
|
interp.StdIO(os.Stdin, buf, os.Stderr),
|
||||||
|
interp.ExecHandler(helpers.ExecHandler(interp.DefaultExecHandler(1000))),
|
||||||
|
)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
scriptContent := `
|
||||||
|
shopt -s globstar
|
||||||
|
files-find-doc ` + tc.args
|
||||||
|
|
||||||
|
script, err := syntax.NewParser().Parse(strings.NewReader(scriptContent), "")
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
err = runner.Run(context.Background(), script)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
contents := strings.Fields(strings.TrimSpace(buf.String()))
|
||||||
|
assert.ElementsMatch(t, tc.expectedOutput, contents)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFindLang(t *testing.T) {
|
||||||
|
tests := []testCase{
|
||||||
|
{
|
||||||
|
name: "All dirs",
|
||||||
|
dirsToCreate: []string{
|
||||||
|
"usr/share/locale/ru/LC_MESSAGES",
|
||||||
|
"usr/share/locale/tr/LC_MESSAGES",
|
||||||
|
},
|
||||||
|
filesToCreate: []string{
|
||||||
|
"usr/share/locale/ru/LC_MESSAGES/yandex-disk.mo",
|
||||||
|
"usr/share/locale/ru/LC_MESSAGES/yandex-disk-indicator.mo",
|
||||||
|
"usr/share/locale/tr/LC_MESSAGES/yandex-disk.mo",
|
||||||
|
},
|
||||||
|
expectedOutput: []string{
|
||||||
|
"./usr/share/locale/ru/LC_MESSAGES/yandex-disk.mo",
|
||||||
|
"./usr/share/locale/ru/LC_MESSAGES/yandex-disk-indicator.mo",
|
||||||
|
"./usr/share/locale/tr/LC_MESSAGES/yandex-disk.mo",
|
||||||
|
},
|
||||||
|
args: "",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "All dirs",
|
||||||
|
dirsToCreate: []string{
|
||||||
|
"usr/share/locale/ru/LC_MESSAGES",
|
||||||
|
"usr/share/locale/tr/LC_MESSAGES",
|
||||||
|
},
|
||||||
|
filesToCreate: []string{
|
||||||
|
"usr/share/locale/ru/LC_MESSAGES/yandex-disk.mo",
|
||||||
|
"usr/share/locale/ru/LC_MESSAGES/yandex-disk-indicator.mo",
|
||||||
|
"usr/share/locale/tr/LC_MESSAGES/yandex-disk.mo",
|
||||||
|
},
|
||||||
|
expectedOutput: []string{
|
||||||
|
"./usr/share/locale/ru/LC_MESSAGES/yandex-disk.mo",
|
||||||
|
"./usr/share/locale/tr/LC_MESSAGES/yandex-disk.mo",
|
||||||
|
},
|
||||||
|
args: "yandex-disk",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range tests {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
tempDir, err := os.MkdirTemp("", "test-files-find-lang")
|
||||||
|
assert.NoError(t, err)
|
||||||
|
defer os.RemoveAll(tempDir)
|
||||||
|
|
||||||
|
for _, dir := range tc.dirsToCreate {
|
||||||
|
dirPath := filepath.Join(tempDir, dir)
|
||||||
|
err := os.MkdirAll(dirPath, 0o755)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, file := range tc.filesToCreate {
|
||||||
|
filePath := filepath.Join(tempDir, file)
|
||||||
|
err := os.WriteFile(filePath, []byte("test content"), 0o644)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
helpers := handlers.ExecFuncs{
|
||||||
|
"files-find-lang": filesFindLangCmd,
|
||||||
|
}
|
||||||
|
buf := &bytes.Buffer{}
|
||||||
|
runner, err := interp.New(
|
||||||
|
interp.Dir(tempDir),
|
||||||
|
interp.StdIO(os.Stdin, buf, os.Stderr),
|
||||||
|
interp.ExecHandler(helpers.ExecHandler(interp.DefaultExecHandler(1000))),
|
||||||
|
)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
scriptContent := `
|
||||||
|
shopt -s globstar
|
||||||
|
files-find-lang ` + tc.args
|
||||||
|
|
||||||
|
script, err := syntax.NewParser().Parse(strings.NewReader(scriptContent), "")
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
err = runner.Run(context.Background(), script)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
contents := strings.Fields(strings.TrimSpace(buf.String()))
|
||||||
|
assert.ElementsMatch(t, tc.expectedOutput, contents)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
458
internal/translations/default.pot
Normal file
458
internal/translations/default.pot
Normal file
@ -0,0 +1,458 @@
|
|||||||
|
msgid ""
|
||||||
|
msgstr ""
|
||||||
|
"Project-Id-Version: \n"
|
||||||
|
"Last-Translator: Automatically generated\n"
|
||||||
|
"Language-Team: none\n"
|
||||||
|
"Language: en\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||||
|
|
||||||
|
#: build.go:41
|
||||||
|
msgid "Build a local package"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: build.go:47
|
||||||
|
msgid "Path to the build script"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: build.go:52
|
||||||
|
msgid "Name of the package to build and its repo (example: default/go-bin)"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: build.go:57
|
||||||
|
msgid ""
|
||||||
|
"Build package from scratch even if there's an already built package available"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: build.go:71
|
||||||
|
msgid "Error pulling repositories"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: build.go:78
|
||||||
|
msgid "Unable to detect a supported package manager on the system"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: build.go:89
|
||||||
|
msgid "Error building package"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: build.go:95
|
||||||
|
msgid "Error getting working directory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: build.go:103
|
||||||
|
msgid "Error moving the package"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: fix.go:37
|
||||||
|
msgid "Attempt to fix problems with ALR"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: fix.go:44
|
||||||
|
msgid "Removing cache directory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: fix.go:48
|
||||||
|
msgid "Unable to remove cache directory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: fix.go:52
|
||||||
|
msgid "Rebuilding cache"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: fix.go:56
|
||||||
|
msgid "Unable to create new cache directory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: fix.go:62
|
||||||
|
msgid "Error pulling repos"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: fix.go:66
|
||||||
|
msgid "Done"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: gen.go:34
|
||||||
|
msgid "Generate a ALR script from a template"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: gen.go:39
|
||||||
|
msgid "Generate a ALR script for a pip module"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: helper.go:41
|
||||||
|
msgid "List all the available helper commands"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: helper.go:53
|
||||||
|
msgid "Run a ALR helper command"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: helper.go:60
|
||||||
|
msgid "The directory that the install commands will install to"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: helper.go:73
|
||||||
|
msgid "No such helper command"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: info.go:42
|
||||||
|
msgid "Print information about a package"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: info.go:47
|
||||||
|
msgid "Show all information, not just for the current distro"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: info.go:57
|
||||||
|
msgid "Error initialization database"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: info.go:64
|
||||||
|
msgid "Command info expected at least 1 argument, got %d"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: info.go:78
|
||||||
|
msgid "Error finding packages"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: info.go:94
|
||||||
|
msgid "Error parsing os-release file"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: info.go:103
|
||||||
|
msgid "Error resolving overrides"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: info.go:112 info.go:118
|
||||||
|
msgid "Error encoding script variables"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: install.go:42
|
||||||
|
msgid "Install a new package"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: install.go:56
|
||||||
|
msgid "Command install expected at least 1 argument, got %d"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: install.go:91
|
||||||
|
msgid "Error getting packages"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: install.go:100
|
||||||
|
msgid "Error iterating over packages"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: install.go:113
|
||||||
|
msgid "Remove an installed package"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: install.go:118
|
||||||
|
msgid "Command remove expected at least 1 argument, got %d"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: install.go:130
|
||||||
|
msgid "Error removing packages"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/cliutils/prompt.go:60
|
||||||
|
msgid "Would you like to view the build script for %s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/cliutils/prompt.go:71
|
||||||
|
msgid "Would you still like to continue?"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/cliutils/prompt.go:77
|
||||||
|
msgid "User chose not to continue after reading script"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/cliutils/prompt.go:111
|
||||||
|
msgid "Error prompting for choice of package"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/cliutils/prompt.go:135
|
||||||
|
msgid "Choose which package to %s"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/cliutils/prompt.go:156
|
||||||
|
msgid "Choose which optional package(s) to install"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/config/config.go:64
|
||||||
|
msgid "Error opening config file, using defaults"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/config/config.go:77
|
||||||
|
msgid "Error decoding config file, using defaults"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/config/config.go:89
|
||||||
|
msgid "Unable to detect user config directory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/config/config.go:97
|
||||||
|
msgid "Unable to create ALR config directory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/config/config.go:106
|
||||||
|
msgid "Unable to create ALR config file"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/config/config.go:112
|
||||||
|
msgid "Error encoding default configuration"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/config/config.go:121
|
||||||
|
msgid "Unable to detect cache directory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/config/config.go:131
|
||||||
|
msgid "Unable to create repo cache directory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/config/config.go:137
|
||||||
|
msgid "Unable to create package cache directory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/config/lang.go:50
|
||||||
|
msgid "Error parsing system language"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/db/db.go:131
|
||||||
|
msgid "Database version mismatch; resetting"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/db/db.go:135
|
||||||
|
msgid ""
|
||||||
|
"Database version does not exist. Run alr fix if something isn't working."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/db/db_legacy.go:101
|
||||||
|
msgid "Error opening database"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/dl/dl.go:170
|
||||||
|
msgid "Source can be updated, updating if required"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/dl/dl.go:201
|
||||||
|
msgid "Source found in cache and linked to destination"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/dl/dl.go:208
|
||||||
|
msgid "Source updated and linked to destination"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/dl/dl.go:222
|
||||||
|
msgid "Downloading source"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: internal/logger/log.go:47
|
||||||
|
msgid "ERROR"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: list.go:40
|
||||||
|
msgid "List ALR repo packages"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: list.go:91
|
||||||
|
msgid "Error listing installed packages"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: main.go:45
|
||||||
|
msgid "Print the current ALR version and exit"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: main.go:61
|
||||||
|
msgid "Arguments to be passed on to the package manager"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: main.go:67
|
||||||
|
msgid "Enable interactive questions and prompts"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: main.go:90
|
||||||
|
msgid ""
|
||||||
|
"Running ALR as root is forbidden as it may cause catastrophic damage to your "
|
||||||
|
"system"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: main.go:124
|
||||||
|
msgid "Error while running app"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:105
|
||||||
|
msgid "Failed to prompt user to view build script"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:109
|
||||||
|
msgid "Building package"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:153
|
||||||
|
msgid "Downloading sources"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:165
|
||||||
|
msgid "Building package metadata"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:187
|
||||||
|
msgid "Compressing package"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:313
|
||||||
|
msgid ""
|
||||||
|
"Your system's CPU architecture doesn't match this package. Do you want to "
|
||||||
|
"build anyway?"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:324
|
||||||
|
msgid "This package is already installed"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:352
|
||||||
|
msgid "Installing build dependencies"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:394
|
||||||
|
msgid "Installing dependencies"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:440
|
||||||
|
msgid "Executing version()"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:460
|
||||||
|
msgid "Updating version"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:465
|
||||||
|
msgid "Executing prepare()"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:475
|
||||||
|
msgid "Executing build()"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:487
|
||||||
|
msgid "Executing package()"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:525
|
||||||
|
msgid "Executing files()"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:600
|
||||||
|
msgid "AutoProv is not implemented for this package format, so it's skipped"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:611
|
||||||
|
msgid "AutoReq is not implemented for this package format, so it's skipped"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:718
|
||||||
|
msgid "Would you like to remove the build dependencies?"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/build.go:824
|
||||||
|
msgid "The checksums array must be the same length as sources"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/findDeps.go:35
|
||||||
|
msgid "Command not found on the system"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/findDeps.go:82
|
||||||
|
msgid "Provided dependency found"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/findDeps.go:89
|
||||||
|
msgid "Required dependency found"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/install.go:42
|
||||||
|
msgid "Error installing native packages"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/build/install.go:79
|
||||||
|
msgid "Error installing package"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/repos/pull.go:75
|
||||||
|
msgid "Pulling repository"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/repos/pull.go:99
|
||||||
|
msgid "Repository up to date"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/repos/pull.go:156
|
||||||
|
msgid "Git repository does not appear to be a valid ALR repo"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: pkg/repos/pull.go:172
|
||||||
|
msgid ""
|
||||||
|
"ALR repo's minimum ALR version is greater than the current version. Try "
|
||||||
|
"updating ALR if something doesn't work."
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: repo.go:41
|
||||||
|
msgid "Add a new repository"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: repo.go:48
|
||||||
|
msgid "Name of the new repo"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: repo.go:54
|
||||||
|
msgid "URL of the new repo"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: repo.go:79 repo.go:136
|
||||||
|
msgid "Error opening config file"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: repo.go:85 repo.go:142
|
||||||
|
msgid "Error encoding config"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: repo.go:103
|
||||||
|
msgid "Remove an existing repository"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: repo.go:110
|
||||||
|
msgid "Name of the repo to be deleted"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: repo.go:128
|
||||||
|
msgid "Repo does not exist"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: repo.go:148
|
||||||
|
msgid "Error removing repo directory"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: repo.go:154
|
||||||
|
msgid "Error removing packages from database"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: repo.go:166
|
||||||
|
msgid "Pull all repositories that have changed"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: upgrade.go:47
|
||||||
|
msgid "Upgrade all installed packages"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: upgrade.go:83
|
||||||
|
msgid "Error checking for updates"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: upgrade.go:94
|
||||||
|
msgid "There is nothing to do."
|
||||||
|
msgstr ""
|
@ -1,155 +0,0 @@
|
|||||||
[[translation]]
|
|
||||||
id = 1228660974
|
|
||||||
value = 'Pulling repository'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2779805870
|
|
||||||
value = 'Repository up to date'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1433222829
|
|
||||||
value = 'Would you like to view the build script for'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2470847050
|
|
||||||
value = 'Failed to prompt user to view build script'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 855659503
|
|
||||||
value = 'Would you still like to continue?'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1997041569
|
|
||||||
value = 'User chose not to continue after reading script'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2347700990
|
|
||||||
value = 'Building package'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2105058868
|
|
||||||
value = 'Downloading sources'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1884485082
|
|
||||||
value = 'Downloading source'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1519177982
|
|
||||||
value = 'Error building package'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2125220917
|
|
||||||
value = 'Choose which package(s) to install'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 812531604
|
|
||||||
value = 'Error prompting for choice of package'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1040982801
|
|
||||||
value = 'Updating version'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1014897988
|
|
||||||
value = 'Remove build dependencies?'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2205430948
|
|
||||||
value = 'Installing build dependencies'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2522710805
|
|
||||||
value = 'Installing dependencies'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 3602138206
|
|
||||||
value = 'Error installing package'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2235794125
|
|
||||||
value = 'Would you like to remove build dependencies?'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2562049386
|
|
||||||
value = "Your system's CPU architecture doesn't match this package. Do you want to build anyway?"
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 4006393493
|
|
||||||
value = 'The checksums array must be the same length as sources'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 3759891273
|
|
||||||
value = 'The package() function is required'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1057080231
|
|
||||||
value = 'Executing package()'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2687735200
|
|
||||||
value = 'Executing prepare()'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 535572372
|
|
||||||
value = 'Executing version()'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 436644691
|
|
||||||
value = 'Executing build()'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1393316459
|
|
||||||
value = 'This package is already installed'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1267660189
|
|
||||||
value = 'Source can be updated, updating if required'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 21753247
|
|
||||||
value = 'Source found in cache, linked to destination'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 257354570
|
|
||||||
value = 'Compressing package'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2952487371
|
|
||||||
value = 'Building package metadata'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 3121791194
|
|
||||||
value = 'Running ALR as root is forbidden as it may cause catastrophic damage to your system'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1256604213
|
|
||||||
value = 'Waiting for torrent metadata'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 432261354
|
|
||||||
value = 'Downloading torrent file'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1579384326
|
|
||||||
value = 'name'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 3206337475
|
|
||||||
value = 'version'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1810056261
|
|
||||||
value = 'new'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1602912115
|
|
||||||
value = 'source'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2363381545
|
|
||||||
value = 'type'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 3419504365
|
|
||||||
value = 'downloader'
|
|
@ -1,151 +0,0 @@
|
|||||||
[[translation]]
|
|
||||||
id = 1228660974
|
|
||||||
value = 'Скачивание репозитория'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2779805870
|
|
||||||
value = 'Репозиторий уже обновлен'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1433222829
|
|
||||||
value = 'Показать скрипт для пакета'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2470847050
|
|
||||||
value = 'Не удалось предложить просмотреть скрипт'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 855659503
|
|
||||||
value = 'Продолжить?'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1997041569
|
|
||||||
value = 'Пользователь решил не продолжать после просмотра скрипта'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2347700990
|
|
||||||
value = 'Сборка пакета'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2105058868
|
|
||||||
value = 'Скачивание файлов'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1884485082
|
|
||||||
value = 'Скачивание источника'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1519177982
|
|
||||||
value = 'Ошибка при сборке пакета'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2125220917
|
|
||||||
value = 'Выберите, какие пакеты установить'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 812531604
|
|
||||||
value = 'Ошибка при запросе выбора пакета'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1040982801
|
|
||||||
value = 'Обновление версии'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2235794125
|
|
||||||
value = 'Удалить зависимости сборки?'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2205430948
|
|
||||||
value = 'Установка зависимостей сборки'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2522710805
|
|
||||||
value = 'Установка зависимостей'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 3602138206
|
|
||||||
value = 'Ошибка при установке пакета'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1057080231
|
|
||||||
value = 'Вызов функции package()'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2687735200
|
|
||||||
value = 'Вызов функции prepare()'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 535572372
|
|
||||||
value = 'Вызов функции version()'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 436644691
|
|
||||||
value = 'Вызов функции build()'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2562049386
|
|
||||||
value = "Архитектура процессора вашей системы не соответствует этому пакету. Продолжать несмотря на это?"
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 3759891273
|
|
||||||
value = 'Функция package() необходима'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 4006393493
|
|
||||||
value = 'Массив checksums должен быть той же длины, что и sources'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1393316459
|
|
||||||
value = 'Этот пакет уже установлен'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1267660189
|
|
||||||
value = 'Источник может быть обновлен, если требуется, обновляем'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 21753247
|
|
||||||
value = 'Источник найден в кэше'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 257354570
|
|
||||||
value = 'Сжатие пакета'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2952487371
|
|
||||||
value = 'Создание метаданных пакета'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 3121791194
|
|
||||||
value = 'Запуск ALR от имени root запрещен, так как это может привести к катастрофическому повреждению вашей системы'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1256604213
|
|
||||||
value = 'Ожидание метаданных торрента'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 432261354
|
|
||||||
value = 'Скачивание торрент-файла'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1579384326
|
|
||||||
value = 'название'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 3206337475
|
|
||||||
value = 'версия'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1810056261
|
|
||||||
value = 'новая'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 1602912115
|
|
||||||
value = 'источник'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 2363381545
|
|
||||||
value = 'вид'
|
|
||||||
|
|
||||||
[[translation]]
|
|
||||||
id = 3419504365
|
|
||||||
value = 'протокол-скачивание'
|
|
478
internal/translations/po/ru/default.po
Normal file
478
internal/translations/po/ru/default.po
Normal file
@ -0,0 +1,478 @@
|
|||||||
|
#
|
||||||
|
# Maxim Slipenko <maks1ms@alt-gnome.ru>, 2025.
|
||||||
|
# x1z53 <x1z53@yandex.ru>, 2025.
|
||||||
|
#
|
||||||
|
msgid ""
|
||||||
|
msgstr ""
|
||||||
|
"Project-Id-Version: unnamed project\n"
|
||||||
|
"PO-Revision-Date: 2025-01-24 21:20+0300\n"
|
||||||
|
"Last-Translator: x1z53 <x1z53@yandex.ru>\n"
|
||||||
|
"Language-Team: Russian\n"
|
||||||
|
"Language: ru\n"
|
||||||
|
"MIME-Version: 1.0\n"
|
||||||
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
|
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
|
||||||
|
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
|
||||||
|
"X-Generator: Gtranslator 47.1\n"
|
||||||
|
|
||||||
|
#: build.go:41
|
||||||
|
msgid "Build a local package"
|
||||||
|
msgstr "Сборка локального пакета"
|
||||||
|
|
||||||
|
#: build.go:47
|
||||||
|
msgid "Path to the build script"
|
||||||
|
msgstr "Путь к скрипту сборки"
|
||||||
|
|
||||||
|
#: build.go:52
|
||||||
|
msgid "Name of the package to build and its repo (example: default/go-bin)"
|
||||||
|
msgstr "Имя пакета для сборки и его репозиторий (пример: default/go-bin)"
|
||||||
|
|
||||||
|
#: build.go:57
|
||||||
|
msgid ""
|
||||||
|
"Build package from scratch even if there's an already built package available"
|
||||||
|
msgstr "Создайте пакет с нуля, даже если уже имеется готовый пакет"
|
||||||
|
|
||||||
|
#: build.go:71
|
||||||
|
msgid "Error pulling repositories"
|
||||||
|
msgstr "Ошибка при извлечении репозиториев"
|
||||||
|
|
||||||
|
#: build.go:78
|
||||||
|
msgid "Unable to detect a supported package manager on the system"
|
||||||
|
msgstr "Не удалось обнаружить поддерживаемый менеджер пакетов в системе"
|
||||||
|
|
||||||
|
#: build.go:89
|
||||||
|
msgid "Error building package"
|
||||||
|
msgstr "Ошибка при сборке пакета"
|
||||||
|
|
||||||
|
#: build.go:95
|
||||||
|
msgid "Error getting working directory"
|
||||||
|
msgstr "Ошибка при получении рабочего каталога"
|
||||||
|
|
||||||
|
#: build.go:103
|
||||||
|
msgid "Error moving the package"
|
||||||
|
msgstr "Ошибка при перемещении пакета"
|
||||||
|
|
||||||
|
#: fix.go:37
|
||||||
|
msgid "Attempt to fix problems with ALR"
|
||||||
|
msgstr "Попытка устранить проблемы с ALR"
|
||||||
|
|
||||||
|
#: fix.go:44
|
||||||
|
msgid "Removing cache directory"
|
||||||
|
msgstr "Удаление каталога кэша"
|
||||||
|
|
||||||
|
#: fix.go:48
|
||||||
|
msgid "Unable to remove cache directory"
|
||||||
|
msgstr "Не удалось удалить каталог кэша"
|
||||||
|
|
||||||
|
#: fix.go:52
|
||||||
|
msgid "Rebuilding cache"
|
||||||
|
msgstr "Восстановление кэша"
|
||||||
|
|
||||||
|
#: fix.go:56
|
||||||
|
msgid "Unable to create new cache directory"
|
||||||
|
msgstr "Не удалось создать новый каталог кэша"
|
||||||
|
|
||||||
|
#: fix.go:62
|
||||||
|
msgid "Error pulling repos"
|
||||||
|
msgstr "Ошибка при извлечении репозиториев"
|
||||||
|
|
||||||
|
#: fix.go:66
|
||||||
|
msgid "Done"
|
||||||
|
msgstr "Сделано"
|
||||||
|
|
||||||
|
#: gen.go:34
|
||||||
|
msgid "Generate a ALR script from a template"
|
||||||
|
msgstr "Генерация скрипта ALR из шаблона"
|
||||||
|
|
||||||
|
#: gen.go:39
|
||||||
|
msgid "Generate a ALR script for a pip module"
|
||||||
|
msgstr "Генерация скрипта ALR для модуля pip"
|
||||||
|
|
||||||
|
#: helper.go:41
|
||||||
|
msgid "List all the available helper commands"
|
||||||
|
msgstr "Список всех доступных вспомогательных команды"
|
||||||
|
|
||||||
|
#: helper.go:53
|
||||||
|
msgid "Run a ALR helper command"
|
||||||
|
msgstr "Запустить вспомогательную команду ALR"
|
||||||
|
|
||||||
|
#: helper.go:60
|
||||||
|
msgid "The directory that the install commands will install to"
|
||||||
|
msgstr "Каталог, в который будут устанавливать команды установки"
|
||||||
|
|
||||||
|
#: helper.go:73
|
||||||
|
msgid "No such helper command"
|
||||||
|
msgstr "Такой вспомогательной команды нет"
|
||||||
|
|
||||||
|
#: info.go:42
|
||||||
|
msgid "Print information about a package"
|
||||||
|
msgstr "Отобразить информацию о пакете"
|
||||||
|
|
||||||
|
#: info.go:47
|
||||||
|
msgid "Show all information, not just for the current distro"
|
||||||
|
msgstr "Показывать всю информацию, не только для текущего дистрибутива"
|
||||||
|
|
||||||
|
#: info.go:57
|
||||||
|
msgid "Error initialization database"
|
||||||
|
msgstr "Ошибка инициализации базы данных"
|
||||||
|
|
||||||
|
#: info.go:64
|
||||||
|
msgid "Command info expected at least 1 argument, got %d"
|
||||||
|
msgstr "Для команды info ожидался хотя бы 1 аргумент, получено %d"
|
||||||
|
|
||||||
|
#: info.go:78
|
||||||
|
msgid "Error finding packages"
|
||||||
|
msgstr "Ошибка при поиске пакетов"
|
||||||
|
|
||||||
|
#: info.go:94
|
||||||
|
msgid "Error parsing os-release file"
|
||||||
|
msgstr "Ошибка при разборе файла выпуска операционной системы"
|
||||||
|
|
||||||
|
#: info.go:103
|
||||||
|
msgid "Error resolving overrides"
|
||||||
|
msgstr "Ошибка устранения переорпеделений"
|
||||||
|
|
||||||
|
#: info.go:112 info.go:118
|
||||||
|
msgid "Error encoding script variables"
|
||||||
|
msgstr "Ошибка кодирования переменных скрита"
|
||||||
|
|
||||||
|
#: install.go:42
|
||||||
|
msgid "Install a new package"
|
||||||
|
msgstr "Установить новый пакет"
|
||||||
|
|
||||||
|
#: install.go:56
|
||||||
|
msgid "Command install expected at least 1 argument, got %d"
|
||||||
|
msgstr "Для команды install ожидался хотя бы 1 аргумент, получено %d"
|
||||||
|
|
||||||
|
#: install.go:91
|
||||||
|
msgid "Error getting packages"
|
||||||
|
msgstr "Ошибка при получении пакетов"
|
||||||
|
|
||||||
|
#: install.go:100
|
||||||
|
msgid "Error iterating over packages"
|
||||||
|
msgstr "Ошибка при переборе пакетов"
|
||||||
|
|
||||||
|
#: install.go:113
|
||||||
|
msgid "Remove an installed package"
|
||||||
|
msgstr "Удалить установленный пакет"
|
||||||
|
|
||||||
|
#: install.go:118
|
||||||
|
msgid "Command remove expected at least 1 argument, got %d"
|
||||||
|
msgstr "Для команды remove ожидался хотя бы 1 аргумент, получено %d"
|
||||||
|
|
||||||
|
#: install.go:130
|
||||||
|
msgid "Error removing packages"
|
||||||
|
msgstr "Ошибка при удалении пакетов"
|
||||||
|
|
||||||
|
#: internal/cliutils/prompt.go:60
|
||||||
|
msgid "Would you like to view the build script for %s"
|
||||||
|
msgstr "Показать скрипт для пакета %s"
|
||||||
|
|
||||||
|
#: internal/cliutils/prompt.go:71
|
||||||
|
msgid "Would you still like to continue?"
|
||||||
|
msgstr "Продолжить?"
|
||||||
|
|
||||||
|
#: internal/cliutils/prompt.go:77
|
||||||
|
msgid "User chose not to continue after reading script"
|
||||||
|
msgstr "Пользователь решил не продолжать после просмотра скрипта"
|
||||||
|
|
||||||
|
#: internal/cliutils/prompt.go:111
|
||||||
|
msgid "Error prompting for choice of package"
|
||||||
|
msgstr "Ошибка при запросе выбора пакета"
|
||||||
|
|
||||||
|
#: internal/cliutils/prompt.go:135
|
||||||
|
msgid "Choose which package to %s"
|
||||||
|
msgstr "Выберите, какой пакет использовать для %s"
|
||||||
|
|
||||||
|
#: internal/cliutils/prompt.go:156
|
||||||
|
msgid "Choose which optional package(s) to install"
|
||||||
|
msgstr "Выберите, какой дополнительный пакет(ы) следует установить"
|
||||||
|
|
||||||
|
#: internal/config/config.go:64
|
||||||
|
msgid "Error opening config file, using defaults"
|
||||||
|
msgstr ""
|
||||||
|
"Ошибка при открытии конфигурационного файла, используются значения по "
|
||||||
|
"умолчанию"
|
||||||
|
|
||||||
|
#: internal/config/config.go:77
|
||||||
|
msgid "Error decoding config file, using defaults"
|
||||||
|
msgstr ""
|
||||||
|
"Ошибка при декодировании конфигурационного файла, используются значения по "
|
||||||
|
"умолчанию"
|
||||||
|
|
||||||
|
#: internal/config/config.go:89
|
||||||
|
msgid "Unable to detect user config directory"
|
||||||
|
msgstr "Не удалось обнаружить каталог конфигурации пользователя"
|
||||||
|
|
||||||
|
#: internal/config/config.go:97
|
||||||
|
msgid "Unable to create ALR config directory"
|
||||||
|
msgstr "Не удалось создать каталог конфигурации ALR"
|
||||||
|
|
||||||
|
#: internal/config/config.go:106
|
||||||
|
msgid "Unable to create ALR config file"
|
||||||
|
msgstr "Не удалось создать конфигурационный файл ALR"
|
||||||
|
|
||||||
|
#: internal/config/config.go:112
|
||||||
|
msgid "Error encoding default configuration"
|
||||||
|
msgstr "Ошибка кодирования конфигурации по умолчанию"
|
||||||
|
|
||||||
|
#: internal/config/config.go:121
|
||||||
|
msgid "Unable to detect cache directory"
|
||||||
|
msgstr "Не удалось обнаружить каталог кэша"
|
||||||
|
|
||||||
|
#: internal/config/config.go:131
|
||||||
|
msgid "Unable to create repo cache directory"
|
||||||
|
msgstr "Не удалось создать каталог кэша репозитория"
|
||||||
|
|
||||||
|
#: internal/config/config.go:137
|
||||||
|
msgid "Unable to create package cache directory"
|
||||||
|
msgstr "Не удалось создать каталог кэша пакетов"
|
||||||
|
|
||||||
|
#: internal/config/lang.go:50
|
||||||
|
msgid "Error parsing system language"
|
||||||
|
msgstr "Ошибка при парсинге языка системы"
|
||||||
|
|
||||||
|
#: internal/db/db.go:131
|
||||||
|
msgid "Database version mismatch; resetting"
|
||||||
|
msgstr "Несоответствие версий базы данных; сброс настроек"
|
||||||
|
|
||||||
|
#: internal/db/db.go:135
|
||||||
|
msgid ""
|
||||||
|
"Database version does not exist. Run alr fix if something isn't working."
|
||||||
|
msgstr ""
|
||||||
|
"Версия базы данных не существует. Запустите alr fix, если что-то не работает."
|
||||||
|
|
||||||
|
#: internal/db/db_legacy.go:101
|
||||||
|
msgid "Error opening database"
|
||||||
|
msgstr "Ошибка при открытии базы данных"
|
||||||
|
|
||||||
|
#: internal/dl/dl.go:170
|
||||||
|
msgid "Source can be updated, updating if required"
|
||||||
|
msgstr "Исходный код можно обновлять, обновляя при необходимости"
|
||||||
|
|
||||||
|
#: internal/dl/dl.go:201
|
||||||
|
msgid "Source found in cache and linked to destination"
|
||||||
|
msgstr "Источник найден в кэше и связан с пунктом назначения"
|
||||||
|
|
||||||
|
#: internal/dl/dl.go:208
|
||||||
|
msgid "Source updated and linked to destination"
|
||||||
|
msgstr "Источник обновлён и связан с пунктом назначения"
|
||||||
|
|
||||||
|
#: internal/dl/dl.go:222
|
||||||
|
msgid "Downloading source"
|
||||||
|
msgstr "Скачивание источника"
|
||||||
|
|
||||||
|
#: internal/logger/log.go:47
|
||||||
|
msgid "ERROR"
|
||||||
|
msgstr "ОШИБКА"
|
||||||
|
|
||||||
|
#: list.go:40
|
||||||
|
msgid "List ALR repo packages"
|
||||||
|
msgstr "Список пакетов репозитория ALR"
|
||||||
|
|
||||||
|
#: list.go:91
|
||||||
|
msgid "Error listing installed packages"
|
||||||
|
msgstr "Ошибка при составлении списка установленных пакетов"
|
||||||
|
|
||||||
|
#: main.go:45
|
||||||
|
msgid "Print the current ALR version and exit"
|
||||||
|
msgstr "Показать текущую версию ALR и выйти"
|
||||||
|
|
||||||
|
#: main.go:61
|
||||||
|
msgid "Arguments to be passed on to the package manager"
|
||||||
|
msgstr "Аргументы, которые будут переданы менеджеру пакетов"
|
||||||
|
|
||||||
|
#: main.go:67
|
||||||
|
msgid "Enable interactive questions and prompts"
|
||||||
|
msgstr "Включение интерактивных вопросов и запросов"
|
||||||
|
|
||||||
|
#: main.go:90
|
||||||
|
msgid ""
|
||||||
|
"Running ALR as root is forbidden as it may cause catastrophic damage to your "
|
||||||
|
"system"
|
||||||
|
msgstr ""
|
||||||
|
"Запуск ALR от имени root запрещён, так как это может привести к "
|
||||||
|
"катастрофическому повреждению вашей системы"
|
||||||
|
|
||||||
|
#: main.go:124
|
||||||
|
msgid "Error while running app"
|
||||||
|
msgstr "Ошибка при запуске приложения"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:105
|
||||||
|
msgid "Failed to prompt user to view build script"
|
||||||
|
msgstr "Не удалось предложить пользователю просмотреть скрипт сборки"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:109
|
||||||
|
msgid "Building package"
|
||||||
|
msgstr "Сборка пакета"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:153
|
||||||
|
msgid "Downloading sources"
|
||||||
|
msgstr "Скачивание источников"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:165
|
||||||
|
msgid "Building package metadata"
|
||||||
|
msgstr "Сборка метаданных пакета"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:187
|
||||||
|
msgid "Compressing package"
|
||||||
|
msgstr "Сжатие пакета"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:313
|
||||||
|
msgid ""
|
||||||
|
"Your system's CPU architecture doesn't match this package. Do you want to "
|
||||||
|
"build anyway?"
|
||||||
|
msgstr ""
|
||||||
|
"Архитектура процессора вашей системы не соответствует этому пакету. Вы все "
|
||||||
|
"равно хотите выполнить сборку?"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:324
|
||||||
|
msgid "This package is already installed"
|
||||||
|
msgstr "Этот пакет уже установлен"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:352
|
||||||
|
msgid "Installing build dependencies"
|
||||||
|
msgstr "Установка зависимостей сборки"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:394
|
||||||
|
msgid "Installing dependencies"
|
||||||
|
msgstr "Установка зависимостей"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:440
|
||||||
|
msgid "Executing version()"
|
||||||
|
msgstr "Исполнение версия()"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:460
|
||||||
|
msgid "Updating version"
|
||||||
|
msgstr "Обновление версии"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:465
|
||||||
|
msgid "Executing prepare()"
|
||||||
|
msgstr "Исполнение prepare()"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:475
|
||||||
|
msgid "Executing build()"
|
||||||
|
msgstr "Исполнение build()"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:487
|
||||||
|
msgid "Executing package()"
|
||||||
|
msgstr "Исполнение package()"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:525
|
||||||
|
msgid "Executing files()"
|
||||||
|
msgstr "Исполнение files()"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:600
|
||||||
|
msgid "AutoProv is not implemented for this package format, so it's skipped"
|
||||||
|
msgstr ""
|
||||||
|
"AutoProv не реализовано для этого формата пакета, поэтому будет пропущено"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:611
|
||||||
|
msgid "AutoReq is not implemented for this package format, so it's skipped"
|
||||||
|
msgstr ""
|
||||||
|
"AutoReq не реализовано для этого формата пакета, поэтому будет пропущено"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:718
|
||||||
|
msgid "Would you like to remove the build dependencies?"
|
||||||
|
msgstr "Хотели бы вы удалить зависимости сборки?"
|
||||||
|
|
||||||
|
#: pkg/build/build.go:824
|
||||||
|
msgid "The checksums array must be the same length as sources"
|
||||||
|
msgstr "Массив контрольных сумм должен быть той же длины, что и источники"
|
||||||
|
|
||||||
|
#: pkg/build/findDeps.go:35
|
||||||
|
msgid "Command not found on the system"
|
||||||
|
msgstr "Команда не найдена в системе"
|
||||||
|
|
||||||
|
#: pkg/build/findDeps.go:82
|
||||||
|
msgid "Provided dependency found"
|
||||||
|
msgstr "Найденная предоставленная зависимость"
|
||||||
|
|
||||||
|
#: pkg/build/findDeps.go:89
|
||||||
|
msgid "Required dependency found"
|
||||||
|
msgstr "Найдена требуемая зависимость"
|
||||||
|
|
||||||
|
#: pkg/build/install.go:42
|
||||||
|
msgid "Error installing native packages"
|
||||||
|
msgstr "Ошибка при установке нативных пакетов"
|
||||||
|
|
||||||
|
#: pkg/build/install.go:79
|
||||||
|
msgid "Error installing package"
|
||||||
|
msgstr "Ошибка при установке пакета"
|
||||||
|
|
||||||
|
#: pkg/repos/pull.go:75
|
||||||
|
msgid "Pulling repository"
|
||||||
|
msgstr "Скачивание репозитория"
|
||||||
|
|
||||||
|
#: pkg/repos/pull.go:99
|
||||||
|
msgid "Repository up to date"
|
||||||
|
msgstr "Репозиторий уже обновлён"
|
||||||
|
|
||||||
|
#: pkg/repos/pull.go:156
|
||||||
|
msgid "Git repository does not appear to be a valid ALR repo"
|
||||||
|
msgstr "Репозиторий Git не поддерживается репозиторием ALR"
|
||||||
|
|
||||||
|
#: pkg/repos/pull.go:172
|
||||||
|
msgid ""
|
||||||
|
"ALR repo's minimum ALR version is greater than the current version. Try "
|
||||||
|
"updating ALR if something doesn't work."
|
||||||
|
msgstr ""
|
||||||
|
"Минимальная версия ALR для ALR-репозитория выше текущей версии. Попробуйте "
|
||||||
|
"обновить ALR, если что-то не работает."
|
||||||
|
|
||||||
|
#: repo.go:41
|
||||||
|
msgid "Add a new repository"
|
||||||
|
msgstr "Добавить новый репозиторий"
|
||||||
|
|
||||||
|
#: repo.go:48
|
||||||
|
msgid "Name of the new repo"
|
||||||
|
msgstr "Название нового репозитория"
|
||||||
|
|
||||||
|
#: repo.go:54
|
||||||
|
msgid "URL of the new repo"
|
||||||
|
msgstr "URL-адрес нового репозитория"
|
||||||
|
|
||||||
|
#: repo.go:79 repo.go:136
|
||||||
|
msgid "Error opening config file"
|
||||||
|
msgstr "Ошибка при открытии конфигурационного файла"
|
||||||
|
|
||||||
|
#: repo.go:85 repo.go:142
|
||||||
|
msgid "Error encoding config"
|
||||||
|
msgstr "Ошибка при кодировании конфигурации"
|
||||||
|
|
||||||
|
#: repo.go:103
|
||||||
|
msgid "Remove an existing repository"
|
||||||
|
msgstr "Удалить существующий репозиторий"
|
||||||
|
|
||||||
|
#: repo.go:110
|
||||||
|
msgid "Name of the repo to be deleted"
|
||||||
|
msgstr "Название репозитория удалён"
|
||||||
|
|
||||||
|
#: repo.go:128
|
||||||
|
msgid "Repo does not exist"
|
||||||
|
msgstr "Репозитория не существует"
|
||||||
|
|
||||||
|
#: repo.go:148
|
||||||
|
msgid "Error removing repo directory"
|
||||||
|
msgstr "Ошибка при удалении каталога репозитория"
|
||||||
|
|
||||||
|
#: repo.go:154
|
||||||
|
msgid "Error removing packages from database"
|
||||||
|
msgstr "Ошибка при удалении пакетов из базы данных"
|
||||||
|
|
||||||
|
#: repo.go:166
|
||||||
|
msgid "Pull all repositories that have changed"
|
||||||
|
msgstr "Скачать все изменённые репозитории"
|
||||||
|
|
||||||
|
#: upgrade.go:47
|
||||||
|
msgid "Upgrade all installed packages"
|
||||||
|
msgstr "Обновить все установленные пакеты"
|
||||||
|
|
||||||
|
#: upgrade.go:83
|
||||||
|
msgid "Error checking for updates"
|
||||||
|
msgstr "Ошибка при проверке обновлений"
|
||||||
|
|
||||||
|
#: upgrade.go:94
|
||||||
|
msgid "There is nothing to do."
|
||||||
|
msgstr "Здесь нечего делать."
|
@ -1,57 +1,52 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package translations
|
package translations
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"embed"
|
"embed"
|
||||||
"sync"
|
"io/fs"
|
||||||
|
"os"
|
||||||
|
"path"
|
||||||
|
|
||||||
"go.elara.ws/logger"
|
"github.com/jeandeaual/go-locale"
|
||||||
"go.elara.ws/translate"
|
"github.com/leonelquinteros/gotext"
|
||||||
"golang.org/x/text/language"
|
|
||||||
|
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
//go:embed files
|
//go:embed po
|
||||||
var translationFS embed.FS
|
var poFS embed.FS
|
||||||
|
|
||||||
var (
|
func Setup() {
|
||||||
mu sync.Mutex
|
userLanguage, err := locale.GetLanguage()
|
||||||
translator *translate.Translator
|
if err != nil {
|
||||||
)
|
panic(err)
|
||||||
|
|
||||||
func Translator(ctx context.Context) *translate.Translator {
|
|
||||||
mu.Lock()
|
|
||||||
defer mu.Unlock()
|
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
if translator == nil {
|
|
||||||
t, err := translate.NewFromFS(translationFS)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error creating new translator").Err(err).Send()
|
|
||||||
}
|
|
||||||
translator = &t
|
|
||||||
}
|
}
|
||||||
return translator
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewLogger(ctx context.Context, l logger.Logger, lang language.Tag) *translate.TranslatedLogger {
|
_, err = fs.Stat(poFS, path.Join("po", userLanguage))
|
||||||
return translate.NewLogger(l, *Translator(ctx), lang)
|
if err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
loc := gotext.NewLocaleFSWithPath(userLanguage, &poFS, "po")
|
||||||
|
loc.SetDomain("default")
|
||||||
|
gotext.SetLocales([]*gotext.Locale{loc})
|
||||||
}
|
}
|
||||||
|
@ -1,24 +1,25 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package types
|
package types
|
||||||
|
|
||||||
import "plemya-x.ru/alr/pkg/manager"
|
import "gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
|
||||||
|
|
||||||
type BuildOpts struct {
|
type BuildOpts struct {
|
||||||
Script string
|
Script string
|
||||||
@ -49,6 +50,8 @@ type BuildVars struct {
|
|||||||
Checksums []string `sh:"checksums"`
|
Checksums []string `sh:"checksums"`
|
||||||
Backup []string `sh:"backup"`
|
Backup []string `sh:"backup"`
|
||||||
Scripts Scripts `sh:"scripts"`
|
Scripts Scripts `sh:"scripts"`
|
||||||
|
AutoReq []string `sh:"auto_req"`
|
||||||
|
AutoProv []string `sh:"auto_prov"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type Scripts struct {
|
type Scripts struct {
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package types
|
package types
|
||||||
|
|
||||||
@ -25,6 +26,7 @@ type Config struct {
|
|||||||
IgnorePkgUpdates []string `toml:"ignorePkgUpdates"`
|
IgnorePkgUpdates []string `toml:"ignorePkgUpdates"`
|
||||||
Repos []Repo `toml:"repo"`
|
Repos []Repo `toml:"repo"`
|
||||||
Unsafe Unsafe `toml:"unsafe"`
|
Unsafe Unsafe `toml:"unsafe"`
|
||||||
|
AutoPull bool `toml:"autoPull"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Repo represents a ALR repo within a configuration file
|
// Repo represents a ALR repo within a configuration file
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package types
|
package types
|
||||||
|
|
||||||
|
18
license-header-old-files.tmpl
Normal file
18
license-header-old-files.tmpl
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
|
It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
|
|
||||||
|
ALR - Any Linux Repository
|
||||||
|
Copyright (C) {{ .Year }} Евгений Храмов
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
15
license-header.tmpl
Normal file
15
license-header.tmpl
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
ALR - Any Linux Repository
|
||||||
|
Copyright (C) {{ .Year }} Евгений Храмов
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
195
list.go
195
list.go
@ -1,109 +1,128 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log/slog"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
"golang.org/x/exp/slices"
|
"golang.org/x/exp/slices"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/internal/db"
|
database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
|
||||||
"plemya-x.ru/alr/pkg/manager"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
|
||||||
"plemya-x.ru/alr/pkg/repos"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var listCmd = &cli.Command{
|
func ListCmd() *cli.Command {
|
||||||
Name: "list",
|
return &cli.Command{
|
||||||
Usage: "List ALR repo packages",
|
Name: "list",
|
||||||
Aliases: []string{"ls"},
|
Usage: gotext.Get("List ALR repo packages"),
|
||||||
Flags: []cli.Flag{
|
Aliases: []string{"ls"},
|
||||||
&cli.BoolFlag{
|
Flags: []cli.Flag{
|
||||||
Name: "installed",
|
&cli.BoolFlag{
|
||||||
Aliases: []string{"I"},
|
Name: "installed",
|
||||||
|
Aliases: []string{"I"},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
Action: func(c *cli.Context) error {
|
||||||
Action: func(c *cli.Context) error {
|
ctx := c.Context
|
||||||
ctx := c.Context
|
cfg := config.New()
|
||||||
log := loggerctx.From(ctx)
|
db := database.New(cfg)
|
||||||
|
err := db.Init(ctx)
|
||||||
err := repos.Pull(ctx, config.Config(ctx).Repos)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error pulling repositories").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
where := "true"
|
|
||||||
args := []any(nil)
|
|
||||||
if c.NArg() > 0 {
|
|
||||||
where = "name LIKE ? OR json_array_contains(provides, ?)"
|
|
||||||
args = []any{c.Args().First(), c.Args().First()}
|
|
||||||
}
|
|
||||||
|
|
||||||
result, err := db.GetPkgs(ctx, where, args...)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error getting packages").Err(err).Send()
|
|
||||||
}
|
|
||||||
defer result.Close()
|
|
||||||
|
|
||||||
var installed map[string]string
|
|
||||||
if c.Bool("installed") {
|
|
||||||
mgr := manager.Detect()
|
|
||||||
if mgr == nil {
|
|
||||||
log.Fatal("Unable to detect a supported package manager on the system").Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
installed, err = mgr.ListInstalled(&manager.Opts{AsRoot: false})
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error listing installed packages").Err(err).Send()
|
slog.Error(gotext.Get("Error initialization database"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
}
|
rs := repos.New(cfg, db)
|
||||||
|
|
||||||
for result.Next() {
|
if cfg.AutoPull(ctx) {
|
||||||
var pkg db.Package
|
err = rs.Pull(ctx, cfg.Repos(ctx))
|
||||||
err := result.StructScan(&pkg)
|
if err != nil {
|
||||||
if err != nil {
|
slog.Error(gotext.Get("Error pulling repositories"), "err", err)
|
||||||
return err
|
os.Exit(1)
|
||||||
}
|
|
||||||
|
|
||||||
if slices.Contains(config.Config(ctx).IgnorePkgUpdates, pkg.Name) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
version := pkg.Version
|
|
||||||
if c.Bool("installed") {
|
|
||||||
instVersion, ok := installed[pkg.Name]
|
|
||||||
if !ok {
|
|
||||||
continue
|
|
||||||
} else {
|
|
||||||
version = instVersion
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Printf("%s/%s %s\n", pkg.Repository, pkg.Name, version)
|
where := "true"
|
||||||
}
|
args := []any(nil)
|
||||||
|
if c.NArg() > 0 {
|
||||||
|
where = "name LIKE ? OR json_array_contains(provides, ?)"
|
||||||
|
args = []any{c.Args().First(), c.Args().First()}
|
||||||
|
}
|
||||||
|
|
||||||
if err != nil {
|
result, err := db.GetPkgs(ctx, where, args...)
|
||||||
log.Fatal("Error iterating over packages").Err(err).Send()
|
if err != nil {
|
||||||
}
|
slog.Error(gotext.Get("Error getting packages"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
defer result.Close()
|
||||||
|
|
||||||
return nil
|
var installed map[string]string
|
||||||
},
|
if c.Bool("installed") {
|
||||||
|
mgr := manager.Detect()
|
||||||
|
if mgr == nil {
|
||||||
|
slog.Error(gotext.Get("Unable to detect a supported package manager on the system"))
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
installed, err = mgr.ListInstalled(&manager.Opts{AsRoot: false})
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error listing installed packages"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for result.Next() {
|
||||||
|
var pkg database.Package
|
||||||
|
err := result.StructScan(&pkg)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if slices.Contains(cfg.IgnorePkgUpdates(ctx), pkg.Name) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
version := pkg.Version
|
||||||
|
if c.Bool("installed") {
|
||||||
|
instVersion, ok := installed[pkg.Name]
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
} else {
|
||||||
|
version = instVersion
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fmt.Printf("%s/%s %s\n", pkg.Repository, pkg.Name, version)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error iterating over packages"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
176
main.go
176
main.go
@ -1,107 +1,117 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"strings"
|
"strings"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
"github.com/mattn/go-isatty"
|
"github.com/mattn/go-isatty"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
"go.elara.ws/logger"
|
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/internal/db"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
"plemya-x.ru/alr/internal/translations"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/translations"
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
|
||||||
"plemya-x.ru/alr/pkg/manager"
|
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
var app = &cli.App{
|
func VersionCmd() *cli.Command {
|
||||||
Name: "alr",
|
return &cli.Command{
|
||||||
Usage: "Any Linux Repository",
|
Name: "version",
|
||||||
Flags: []cli.Flag{
|
Usage: gotext.Get("Print the current ALR version and exit"),
|
||||||
&cli.StringFlag{
|
Action: func(ctx *cli.Context) error {
|
||||||
Name: "pm-args",
|
println(config.Version)
|
||||||
Aliases: []string{"P"},
|
return nil
|
||||||
Usage: "Arguments to be passed on to the package manager",
|
|
||||||
},
|
},
|
||||||
&cli.BoolFlag{
|
}
|
||||||
Name: "interactive",
|
|
||||||
Aliases: []string{"i"},
|
|
||||||
Value: isatty.IsTerminal(os.Stdin.Fd()),
|
|
||||||
Usage: "Enable interactive questions and prompts",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Commands: []*cli.Command{
|
|
||||||
installCmd,
|
|
||||||
removeCmd,
|
|
||||||
upgradeCmd,
|
|
||||||
infoCmd,
|
|
||||||
listCmd,
|
|
||||||
buildCmd,
|
|
||||||
addrepoCmd,
|
|
||||||
removerepoCmd,
|
|
||||||
refreshCmd,
|
|
||||||
fixCmd,
|
|
||||||
genCmd,
|
|
||||||
helperCmd,
|
|
||||||
versionCmd,
|
|
||||||
},
|
|
||||||
Before: func(c *cli.Context) error {
|
|
||||||
ctx := c.Context
|
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
|
|
||||||
cmd := c.Args().First()
|
|
||||||
if cmd != "helper" && !config.Config(ctx).Unsafe.AllowRunAsRoot && os.Geteuid() == 0 {
|
|
||||||
log.Fatal("Running ALR as root is forbidden as it may cause catastrophic damage to your system").Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
if trimmed := strings.TrimSpace(c.String("pm-args")); trimmed != "" {
|
|
||||||
args := strings.Split(trimmed, " ")
|
|
||||||
manager.Args = append(manager.Args, args...)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
After: func(ctx *cli.Context) error {
|
|
||||||
return db.Close()
|
|
||||||
},
|
|
||||||
EnableBashCompletion: true,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var versionCmd = &cli.Command{
|
func GetApp() *cli.App {
|
||||||
Name: "version",
|
return &cli.App{
|
||||||
Usage: "Print the current ALR version and exit",
|
Name: "alr",
|
||||||
Action: func(ctx *cli.Context) error {
|
Usage: "Any Linux Repository",
|
||||||
println(config.Version)
|
Flags: []cli.Flag{
|
||||||
return nil
|
&cli.StringFlag{
|
||||||
},
|
Name: "pm-args",
|
||||||
|
Aliases: []string{"P"},
|
||||||
|
Usage: gotext.Get("Arguments to be passed on to the package manager"),
|
||||||
|
},
|
||||||
|
&cli.BoolFlag{
|
||||||
|
Name: "interactive",
|
||||||
|
Aliases: []string{"i"},
|
||||||
|
Value: isatty.IsTerminal(os.Stdin.Fd()),
|
||||||
|
Usage: gotext.Get("Enable interactive questions and prompts"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Commands: []*cli.Command{
|
||||||
|
InstallCmd(),
|
||||||
|
RemoveCmd(),
|
||||||
|
UpgradeCmd(),
|
||||||
|
InfoCmd(),
|
||||||
|
ListCmd(),
|
||||||
|
BuildCmd(),
|
||||||
|
AddRepoCmd(),
|
||||||
|
RemoveRepoCmd(),
|
||||||
|
RefreshCmd(),
|
||||||
|
FixCmd(),
|
||||||
|
GenCmd(),
|
||||||
|
HelperCmd(),
|
||||||
|
VersionCmd(),
|
||||||
|
},
|
||||||
|
Before: func(c *cli.Context) error {
|
||||||
|
ctx := c.Context
|
||||||
|
|
||||||
|
cmd := c.Args().First()
|
||||||
|
if cmd != "helper" && !config.Config(ctx).Unsafe.AllowRunAsRoot && os.Geteuid() == 0 {
|
||||||
|
slog.Error(gotext.Get("Running ALR as root is forbidden as it may cause catastrophic damage to your system"))
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
if trimmed := strings.TrimSpace(c.String("pm-args")); trimmed != "" {
|
||||||
|
args := strings.Split(trimmed, " ")
|
||||||
|
manager.Args = append(manager.Args, args...)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
After: func(ctx *cli.Context) error {
|
||||||
|
return db.Close()
|
||||||
|
},
|
||||||
|
EnableBashCompletion: true,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
translations.Setup()
|
||||||
|
logger.SetupDefault()
|
||||||
|
|
||||||
|
app := GetApp()
|
||||||
|
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
log := translations.NewLogger(ctx, logger.NewCLI(os.Stderr), config.Language(ctx))
|
|
||||||
ctx = loggerctx.With(ctx, log)
|
|
||||||
|
|
||||||
// Set the root command to the one set in the ALR config
|
// Set the root command to the one set in the ALR config
|
||||||
manager.DefaultRootCmd = config.Config(ctx).RootCmd
|
manager.DefaultRootCmd = config.Config(ctx).RootCmd
|
||||||
@ -111,6 +121,6 @@ func main() {
|
|||||||
|
|
||||||
err := app.RunContext(ctx, os.Args)
|
err := app.RunContext(ctx, os.Args)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("Error while running app").Err(err).Send()
|
slog.Error(gotext.Get("Error while running app"), "err", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
83
old-files
Normal file
83
old-files
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
./.github/FUNDING.yml
|
||||||
|
./.gitignore
|
||||||
|
./.goreleaser.yaml
|
||||||
|
./.woodpecker.yml
|
||||||
|
./LICENSE
|
||||||
|
./Makefile
|
||||||
|
./README.md
|
||||||
|
./assets/logo.png
|
||||||
|
./build.go
|
||||||
|
./docs/README.md
|
||||||
|
./docs/configuration.md
|
||||||
|
./docs/packages/README.md
|
||||||
|
./docs/packages/adding-packages.md
|
||||||
|
./docs/packages/build-scripts.md
|
||||||
|
./docs/packages/conventions.md
|
||||||
|
./docs/usage.md
|
||||||
|
./fix.go
|
||||||
|
./gen.go
|
||||||
|
./go.mod
|
||||||
|
./go.sum
|
||||||
|
./helper.go
|
||||||
|
./info.go
|
||||||
|
./install.go
|
||||||
|
./internal/cliutils/prompt.go
|
||||||
|
./internal/config/config.go
|
||||||
|
./internal/config/lang.go
|
||||||
|
./internal/config/paths.go
|
||||||
|
./internal/config/version.go
|
||||||
|
./internal/cpu/cpu.go
|
||||||
|
./internal/db/db.go
|
||||||
|
./internal/db/db_test.go
|
||||||
|
./internal/dl/dl.go
|
||||||
|
./internal/dl/file.go
|
||||||
|
./internal/dl/git.go
|
||||||
|
./internal/dl/torrent.go
|
||||||
|
./internal/dlcache/dlcache.go
|
||||||
|
./internal/dlcache/dlcache_test.go
|
||||||
|
./internal/osutils/move.go
|
||||||
|
./internal/overrides/overrides.go
|
||||||
|
./internal/overrides/overrides_test.go
|
||||||
|
./internal/pager/highlighting.go
|
||||||
|
./internal/pager/pager.go
|
||||||
|
./internal/shutils/decoder/decoder.go
|
||||||
|
./internal/shutils/decoder/decoder_test.go
|
||||||
|
./internal/shutils/handlers/exec.go
|
||||||
|
./internal/shutils/handlers/exec_test.go
|
||||||
|
./internal/shutils/handlers/fakeroot.go
|
||||||
|
./internal/shutils/handlers/nop.go
|
||||||
|
./internal/shutils/handlers/nop_test.go
|
||||||
|
./internal/shutils/handlers/restricted.go
|
||||||
|
./internal/shutils/helpers/helpers.go
|
||||||
|
./internal/translations/files/lure.en.toml
|
||||||
|
./internal/translations/files/lure.ru.toml
|
||||||
|
./internal/translations/translations.go
|
||||||
|
./internal/types/build.go
|
||||||
|
./internal/types/config.go
|
||||||
|
./internal/types/repo.go
|
||||||
|
./list.go
|
||||||
|
./main.go
|
||||||
|
./pkg/build/build.go
|
||||||
|
./pkg/build/install.go
|
||||||
|
./pkg/distro/osrelease.go
|
||||||
|
./pkg/gen/funcs.go
|
||||||
|
./pkg/gen/pip.go
|
||||||
|
./pkg/gen/tmpls/pip.tmpl.sh
|
||||||
|
./pkg/loggerctx/log.go
|
||||||
|
./pkg/manager/apk.go
|
||||||
|
./pkg/manager/apt.go
|
||||||
|
./pkg/manager/dnf.go
|
||||||
|
./pkg/manager/managers.go
|
||||||
|
./pkg/manager/pacman.go
|
||||||
|
./pkg/manager/yum.go
|
||||||
|
./pkg/manager/zypper.go
|
||||||
|
./pkg/repos/find.go
|
||||||
|
./pkg/repos/find_test.go
|
||||||
|
./pkg/repos/pull.go
|
||||||
|
./pkg/repos/pull_test.go
|
||||||
|
./pkg/search/search.go
|
||||||
|
./repo.go
|
||||||
|
./scripts/completion/bash
|
||||||
|
./scripts/completion/zsh
|
||||||
|
./scripts/install.sh
|
||||||
|
./upgrade.go
|
@ -1,29 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
* Это программное обеспечение свободно: вы можете распространять его и/или изменять
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* на условиях GNU General Public License, опубликованной Free Software Foundation,
|
// (at your option) any later version.
|
||||||
* либо версии 3 лицензии, либо (на ваш выбор) любой более поздней версии.
|
//
|
||||||
*
|
// This program is distributed in the hope that it will be useful,
|
||||||
* This program is distributed in the hope that it will be useful,
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// GNU General Public License for more details.
|
||||||
* GNU General Public License for more details.
|
//
|
||||||
* Это программное обеспечение распространяется в надежде, что оно будет полезным,
|
// You should have received a copy of the GNU General Public License
|
||||||
* но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ; даже без подразумеваемой гарантии
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* КОММЕРЧЕСКОЙ ПРИГОДНОСТИ или ПРИГОДНОСТИ ДЛЯ ОПРЕДЕЛЕННОЙ ЦЕЛИ. См.
|
|
||||||
* GNU General Public License для более подробной информации.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
* Вы должны были получить копию GNU General Public License
|
|
||||||
* вместе с этой программой. Если нет, см. <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package build
|
package build
|
||||||
|
|
||||||
@ -33,6 +25,7 @@ import (
|
|||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
@ -42,36 +35,39 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
// Импортируем пакеты для поддержки различных форматов пакетов (APK, DEB, RPM и ARCH).
|
// Импортируем пакеты для поддержки различных форматов пакетов (APK, DEB, RPM и ARCH).
|
||||||
|
|
||||||
_ "github.com/goreleaser/nfpm/v2/apk"
|
_ "github.com/goreleaser/nfpm/v2/apk"
|
||||||
_ "github.com/goreleaser/nfpm/v2/arch"
|
_ "github.com/goreleaser/nfpm/v2/arch"
|
||||||
_ "github.com/goreleaser/nfpm/v2/deb"
|
_ "github.com/goreleaser/nfpm/v2/deb"
|
||||||
_ "github.com/goreleaser/nfpm/v2/rpm"
|
_ "github.com/goreleaser/nfpm/v2/rpm"
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
"mvdan.cc/sh/v3/expand"
|
"mvdan.cc/sh/v3/expand"
|
||||||
"mvdan.cc/sh/v3/interp"
|
"mvdan.cc/sh/v3/interp"
|
||||||
|
"mvdan.cc/sh/v3/shell"
|
||||||
"mvdan.cc/sh/v3/syntax"
|
"mvdan.cc/sh/v3/syntax"
|
||||||
|
|
||||||
"github.com/goreleaser/nfpm/v2"
|
"github.com/goreleaser/nfpm/v2"
|
||||||
"github.com/goreleaser/nfpm/v2/files"
|
"github.com/goreleaser/nfpm/v2/files"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/cliutils"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils"
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/internal/cpu"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu"
|
||||||
"plemya-x.ru/alr/internal/db"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
"plemya-x.ru/alr/internal/dl"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/dl"
|
||||||
"plemya-x.ru/alr/internal/shutils/decoder"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
|
||||||
"plemya-x.ru/alr/internal/shutils/handlers"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder"
|
||||||
"plemya-x.ru/alr/internal/shutils/helpers"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
|
||||||
"plemya-x.ru/alr/internal/types"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/helpers"
|
||||||
"plemya-x.ru/alr/pkg/distro"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
|
||||||
"plemya-x.ru/alr/pkg/manager"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
|
||||||
"plemya-x.ru/alr/pkg/repos"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Функция BuildPackage выполняет сборку скрипта по указанному пути. Возвращает два среза.
|
// Функция BuildPackage выполняет сборку скрипта по указанному пути. Возвращает два среза.
|
||||||
// Один содержит пути к собранным пакетам, другой - имена собранных пакетов.
|
// Один содержит пути к собранным пакетам, другой - имена собранных пакетов.
|
||||||
func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string, error) {
|
func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string, error) {
|
||||||
log := loggerctx.From(ctx)
|
reposInstance := repos.GetInstance(ctx)
|
||||||
|
|
||||||
info, err := distro.ParseOSRelease(ctx)
|
info, err := distro.ParseOSRelease(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -108,10 +104,11 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string
|
|||||||
// Спрашиваем у пользователя, хочет ли он увидеть скрипт сборки.
|
// Спрашиваем у пользователя, хочет ли он увидеть скрипт сборки.
|
||||||
err = cliutils.PromptViewScript(ctx, opts.Script, vars.Name, config.Config(ctx).PagerStyle, opts.Interactive)
|
err = cliutils.PromptViewScript(ctx, opts.Script, vars.Name, config.Config(ctx).PagerStyle, opts.Interactive)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Failed to prompt user to view build script").Err(err).Send()
|
slog.Error(gotext.Get("Failed to prompt user to view build script"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Info("Building package").Str("name", vars.Name).Str("version", vars.Version).Send()
|
slog.Info(gotext.Get("Building package"), "name", vars.Name, "version", vars.Version)
|
||||||
|
|
||||||
// Второй проход будет использоваться для выполнения реального кода,
|
// Второй проход будет использоваться для выполнения реального кода,
|
||||||
// поэтому он не ограничен. Скрипт уже был показан
|
// поэтому он не ограничен. Скрипт уже был показан
|
||||||
@ -140,12 +137,12 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string
|
|||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
buildDeps, err := installBuildDeps(ctx, vars, opts, installed) // Устанавливаем зависимости для сборки
|
buildDeps, err := installBuildDeps(ctx, reposInstance, vars, opts) // Устанавливаем зависимости для сборки
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
err = installOptDeps(ctx, vars, opts, installed) // Устанавливаем опциональные зависимости
|
err = installOptDeps(ctx, reposInstance, vars, opts) // Устанавливаем опциональные зависимости
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
@ -155,23 +152,23 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string
|
|||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Info("Downloading sources").Send() // Записываем в лог загрузку источников
|
slog.Info(gotext.Get("Downloading sources")) // Записываем в лог загрузку источников
|
||||||
|
|
||||||
err = getSources(ctx, dirs, vars) // Загружаем исходники
|
err = getSources(ctx, dirs, vars) // Загружаем исходники
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
err = executeFunctions(ctx, dec, dirs, vars) // Выполняем специальные функции
|
funcOut, err := executeFunctions(ctx, dec, dirs, vars) // Выполняем специальные функции
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Info("Building package metadata").Str("name", vars.Name).Send() // Логгируем сборку метаданных пакета
|
slog.Info(gotext.Get("Building package metadata"), "name", vars.Name)
|
||||||
|
|
||||||
pkgFormat := getPkgFormat(opts.Manager) // Получаем формат пакета
|
pkgFormat := getPkgFormat(opts.Manager) // Получаем формат пакета
|
||||||
|
|
||||||
pkgInfo, err := buildPkgMetadata(ctx, vars, dirs, pkgFormat, info, append(repoDeps, builtNames...)) // Собираем метаданные пакета
|
pkgInfo, err := buildPkgMetadata(ctx, vars, dirs, pkgFormat, info, append(repoDeps, builtNames...), funcOut.Contents) // Собираем метаданные пакета
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
@ -189,7 +186,7 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string
|
|||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Info("Compressing package").Str("name", pkgName).Send() // Логгируем сжатие пакета
|
slog.Info(gotext.Get("Compressing package"), "name", pkgName) // Логгируем сжатие пакета
|
||||||
|
|
||||||
err = packager.Package(pkgInfo, pkgFile) // Упаковываем пакет
|
err = packager.Package(pkgInfo, pkgFile) // Упаковываем пакет
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -314,9 +311,8 @@ func prepareDirs(dirs types.Directories) error {
|
|||||||
|
|
||||||
// Функция performChecks проверяет различные аспекты в системе, чтобы убедиться, что пакет может быть установлен.
|
// Функция performChecks проверяет различные аспекты в системе, чтобы убедиться, что пакет может быть установлен.
|
||||||
func performChecks(ctx context.Context, vars *types.BuildVars, interactive bool, installed map[string]string) (bool, error) {
|
func performChecks(ctx context.Context, vars *types.BuildVars, interactive bool, installed map[string]string) (bool, error) {
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
if !cpu.IsCompatibleWith(cpu.Arch(), vars.Architectures) { // Проверяем совместимость архитектуры
|
if !cpu.IsCompatibleWith(cpu.Arch(), vars.Architectures) { // Проверяем совместимость архитектуры
|
||||||
cont, err := cliutils.YesNoPrompt(ctx, "Your system's CPU architecture doesn't match this package. Do you want to build anyway?", interactive, true)
|
cont, err := cliutils.YesNoPrompt(ctx, gotext.Get("Your system's CPU architecture doesn't match this package. Do you want to build anyway?"), interactive, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
@ -327,29 +323,35 @@ func performChecks(ctx context.Context, vars *types.BuildVars, interactive bool,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if instVer, ok := installed[vars.Name]; ok { // Если пакет уже установлен, выводим предупреждение
|
if instVer, ok := installed[vars.Name]; ok { // Если пакет уже установлен, выводим предупреждение
|
||||||
log.Warn("This package is already installed").
|
slog.Warn(gotext.Get("This package is already installed"),
|
||||||
Str("name", vars.Name).
|
"name", vars.Name,
|
||||||
Str("version", instVer).
|
"version", instVer,
|
||||||
Send()
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
return true, nil
|
return true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type PackageFinder interface {
|
||||||
|
FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error)
|
||||||
|
}
|
||||||
|
|
||||||
// Функция installBuildDeps устанавливает все зависимости сборки, которые еще не установлены, и возвращает
|
// Функция installBuildDeps устанавливает все зависимости сборки, которые еще не установлены, и возвращает
|
||||||
// срез, содержащий имена всех установленных пакетов.
|
// срез, содержащий имена всех установленных пакетов.
|
||||||
func installBuildDeps(ctx context.Context, vars *types.BuildVars, opts types.BuildOpts, installed map[string]string) ([]string, error) {
|
func installBuildDeps(ctx context.Context, repos PackageFinder, vars *types.BuildVars, opts types.BuildOpts) ([]string, error) {
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
var buildDeps []string
|
var buildDeps []string
|
||||||
if len(vars.BuildDepends) > 0 {
|
if len(vars.BuildDepends) > 0 {
|
||||||
found, notFound, err := repos.FindPkgs(ctx, vars.BuildDepends) // Находим пакеты-зависимости
|
deps, err := removeAlreadyInstalled(opts, vars.BuildDepends)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
found = removeAlreadyInstalled(found, installed) // Убираем уже установленные зависимости
|
found, notFound, err := repos.FindPkgs(ctx, deps) // Находим пакеты-зависимости
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
log.Info("Installing build dependencies").Send() // Логгируем установку зависимостей
|
slog.Info(gotext.Get("Installing build dependencies")) // Логгируем установку зависимостей
|
||||||
|
|
||||||
flattened := cliutils.FlattenPkgs(ctx, found, "install", opts.Interactive) // Уплощаем список зависимостей
|
flattened := cliutils.FlattenPkgs(ctx, found, "install", opts.Interactive) // Уплощаем список зависимостей
|
||||||
buildDeps = packageNames(flattened)
|
buildDeps = packageNames(flattened)
|
||||||
@ -360,9 +362,13 @@ func installBuildDeps(ctx context.Context, vars *types.BuildVars, opts types.Bui
|
|||||||
|
|
||||||
// Функция installOptDeps спрашивает у пользователя, какие, если таковые имеются, опциональные зависимости он хочет установить.
|
// Функция installOptDeps спрашивает у пользователя, какие, если таковые имеются, опциональные зависимости он хочет установить.
|
||||||
// Если пользователь решает установить какие-либо опциональные зависимости, выполняется их установка.
|
// Если пользователь решает установить какие-либо опциональные зависимости, выполняется их установка.
|
||||||
func installOptDeps(ctx context.Context, vars *types.BuildVars, opts types.BuildOpts, installed map[string]string) error {
|
func installOptDeps(ctx context.Context, repos PackageFinder, vars *types.BuildVars, opts types.BuildOpts) error {
|
||||||
if len(vars.OptDepends) > 0 {
|
optDeps, err := removeAlreadyInstalled(opts, vars.OptDepends)
|
||||||
optDeps, err := cliutils.ChooseOptDepends(ctx, vars.OptDepends, "install", opts.Interactive) // Пользователя просят выбрать опциональные зависимости
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if len(optDeps) > 0 {
|
||||||
|
optDeps, err := cliutils.ChooseOptDepends(ctx, optDeps, "install", opts.Interactive) // Пользователя просят выбрать опциональные зависимости
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -376,7 +382,6 @@ func installOptDeps(ctx context.Context, vars *types.BuildVars, opts types.Build
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
found = removeAlreadyInstalled(found, installed) // Убираем уже установленные зависимости
|
|
||||||
flattened := cliutils.FlattenPkgs(ctx, found, "install", opts.Interactive)
|
flattened := cliutils.FlattenPkgs(ctx, found, "install", opts.Interactive)
|
||||||
InstallPkgs(ctx, flattened, notFound, opts) // Устанавливаем выбранные пакеты
|
InstallPkgs(ctx, flattened, notFound, opts) // Устанавливаем выбранные пакеты
|
||||||
}
|
}
|
||||||
@ -387,9 +392,8 @@ func installOptDeps(ctx context.Context, vars *types.BuildVars, opts types.Build
|
|||||||
// пакетов, которые она собрала, а также все зависимости, которые не были найдены в ALR репозитории,
|
// пакетов, которые она собрала, а также все зависимости, которые не были найдены в ALR репозитории,
|
||||||
// чтобы они могли быть установлены из системных репозиториев.
|
// чтобы они могли быть установлены из системных репозиториев.
|
||||||
func buildALRDeps(ctx context.Context, opts types.BuildOpts, vars *types.BuildVars) (builtPaths, builtNames, repoDeps []string, err error) {
|
func buildALRDeps(ctx context.Context, opts types.BuildOpts, vars *types.BuildVars) (builtPaths, builtNames, repoDeps []string, err error) {
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
if len(vars.Depends) > 0 {
|
if len(vars.Depends) > 0 {
|
||||||
log.Info("Installing dependencies").Send()
|
slog.Info(gotext.Get("Installing dependencies"))
|
||||||
|
|
||||||
found, notFound, err := repos.FindPkgs(ctx, vars.Depends) // Поиск зависимостей
|
found, notFound, err := repos.FindPkgs(ctx, vars.Depends) // Поиск зависимостей
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -427,51 +431,54 @@ func buildALRDeps(ctx context.Context, opts types.BuildOpts, vars *types.BuildVa
|
|||||||
return builtPaths, builtNames, repoDeps, nil
|
return builtPaths, builtNames, repoDeps, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type FunctionsOutput struct {
|
||||||
|
Contents *[]string
|
||||||
|
}
|
||||||
|
|
||||||
// Функция executeFunctions выполняет специальные функции ALR, такие как version(), prepare() и т.д.
|
// Функция executeFunctions выполняет специальные функции ALR, такие как version(), prepare() и т.д.
|
||||||
func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Directories, vars *types.BuildVars) (err error) {
|
func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Directories, vars *types.BuildVars) (*FunctionsOutput, error) {
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
version, ok := dec.GetFunc("version")
|
version, ok := dec.GetFunc("version")
|
||||||
if ok {
|
if ok {
|
||||||
log.Info("Executing version()").Send()
|
slog.Info(gotext.Get("Executing version()"))
|
||||||
|
|
||||||
buf := &bytes.Buffer{}
|
buf := &bytes.Buffer{}
|
||||||
|
|
||||||
err = version(
|
err := version(
|
||||||
ctx,
|
ctx,
|
||||||
interp.Dir(dirs.SrcDir),
|
interp.Dir(dirs.SrcDir),
|
||||||
interp.StdIO(os.Stdin, buf, os.Stderr),
|
interp.StdIO(os.Stdin, buf, os.Stderr),
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
newVer := strings.TrimSpace(buf.String())
|
newVer := strings.TrimSpace(buf.String())
|
||||||
err = setVersion(ctx, dec.Runner, newVer)
|
err = setVersion(ctx, dec.Runner, newVer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
vars.Version = newVer
|
vars.Version = newVer
|
||||||
|
|
||||||
log.Info("Updating version").Str("new", newVer).Send()
|
slog.Info(gotext.Get("Updating version"), "new", newVer)
|
||||||
}
|
}
|
||||||
|
|
||||||
prepare, ok := dec.GetFunc("prepare")
|
prepare, ok := dec.GetFunc("prepare")
|
||||||
if ok {
|
if ok {
|
||||||
log.Info("Executing prepare()").Send()
|
slog.Info(gotext.Get("Executing prepare()"))
|
||||||
|
|
||||||
err = prepare(ctx, interp.Dir(dirs.SrcDir))
|
err := prepare(ctx, interp.Dir(dirs.SrcDir))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
build, ok := dec.GetFunc("build")
|
build, ok := dec.GetFunc("build")
|
||||||
if ok {
|
if ok {
|
||||||
log.Info("Executing build()").Send()
|
slog.Info(gotext.Get("Executing build()"))
|
||||||
|
|
||||||
err = build(ctx, interp.Dir(dirs.SrcDir))
|
err := build(ctx, interp.Dir(dirs.SrcDir))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -479,31 +486,77 @@ func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Dire
|
|||||||
for {
|
for {
|
||||||
packageFn, ok := dec.GetFunc("package")
|
packageFn, ok := dec.GetFunc("package")
|
||||||
if ok {
|
if ok {
|
||||||
log.Info("Executing package()").Send()
|
slog.Info(gotext.Get("Executing package()"))
|
||||||
err = packageFn(ctx, interp.Dir(dirs.SrcDir))
|
err := packageFn(ctx, interp.Dir(dirs.SrcDir))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Проверка на наличие дополнительных функций package_*
|
/*
|
||||||
packageFuncName := "package_"
|
// Проверка на наличие дополнительных функций package_*
|
||||||
if packageFunc, ok := dec.GetFunc(packageFuncName); ok {
|
packageFuncName := "package_"
|
||||||
log.Info("Executing " + packageFuncName).Send()
|
if packageFunc, ok := dec.GetFunc(packageFuncName); ok {
|
||||||
err = packageFunc(ctx, interp.Dir(dirs.SrcDir))
|
slog.Info("Executing " + packageFuncName)
|
||||||
if err != nil {
|
err = packageFunc(ctx, interp.Dir(dirs.SrcDir))
|
||||||
return err
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
break // Если больше нет функций package_*, выходим из цикла
|
||||||
}
|
}
|
||||||
} else {
|
*/
|
||||||
break // Если больше нет функций package_*, выходим из цикла
|
break
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
output := &FunctionsOutput{}
|
||||||
|
|
||||||
|
files, ok := dec.GetFuncP("files", func(ctx context.Context, s *interp.Runner) error {
|
||||||
|
// It should be done via interp.RunnerOption,
|
||||||
|
// but due to the issues below, it cannot be done.
|
||||||
|
// - https://github.com/mvdan/sh/issues/962
|
||||||
|
// - https://github.com/mvdan/sh/issues/1125
|
||||||
|
script, err := syntax.NewParser().Parse(strings.NewReader("cd $pkgdir && shopt -s globstar"), "")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return s.Run(ctx, script)
|
||||||
|
})
|
||||||
|
|
||||||
|
if ok {
|
||||||
|
slog.Info(gotext.Get("Executing files()"))
|
||||||
|
|
||||||
|
buf := &bytes.Buffer{}
|
||||||
|
|
||||||
|
err := files(
|
||||||
|
ctx,
|
||||||
|
interp.Dir(dirs.PkgDir),
|
||||||
|
interp.StdIO(os.Stdin, buf, os.Stderr),
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
contents, err := shell.Fields(buf.String(), func(s string) string { return "" })
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
output.Contents = &contents
|
||||||
|
}
|
||||||
|
|
||||||
|
return output, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Функция buildPkgMetadata создает метаданные для пакета, который будет собран.
|
// Функция buildPkgMetadata создает метаданные для пакета, который будет собран.
|
||||||
func buildPkgMetadata(ctx context.Context, vars *types.BuildVars, dirs types.Directories, pkgFormat string, info *distro.OSRelease, deps []string) (*nfpm.Info, error) {
|
func buildPkgMetadata(
|
||||||
|
ctx context.Context,
|
||||||
|
vars *types.BuildVars,
|
||||||
|
dirs types.Directories,
|
||||||
|
pkgFormat string,
|
||||||
|
info *distro.OSRelease,
|
||||||
|
deps []string,
|
||||||
|
preferedContents *[]string,
|
||||||
|
) (*nfpm.Info, error) {
|
||||||
pkgInfo := getBasePkgInfo(vars)
|
pkgInfo := getBasePkgInfo(vars)
|
||||||
pkgInfo.Description = vars.Description
|
pkgInfo.Description = vars.Description
|
||||||
pkgInfo.Platform = "linux"
|
pkgInfo.Platform = "linux"
|
||||||
@ -524,9 +577,7 @@ func buildPkgMetadata(ctx context.Context, vars *types.BuildVars, dirs types.Dir
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
if pkgFormat == "rpm" && info.ID == "altlinux" {
|
pkgInfo.Release = overrides.ReleasePlatformSpecific(vars.Release, info)
|
||||||
pkgInfo.Release = "alt" + pkgInfo.Release
|
|
||||||
}
|
|
||||||
|
|
||||||
if vars.Epoch != 0 {
|
if vars.Epoch != 0 {
|
||||||
pkgInfo.Epoch = strconv.FormatUint(uint64(vars.Epoch), 10)
|
pkgInfo.Epoch = strconv.FormatUint(uint64(vars.Epoch), 10)
|
||||||
@ -538,20 +589,31 @@ func buildPkgMetadata(ctx context.Context, vars *types.BuildVars, dirs types.Dir
|
|||||||
pkgInfo.Arch = "all"
|
pkgInfo.Arch = "all"
|
||||||
}
|
}
|
||||||
|
|
||||||
contents, err := buildContents(vars, dirs)
|
contents, err := buildContents(vars, dirs, preferedContents)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
pkgInfo.Overridables.Contents = contents
|
pkgInfo.Overridables.Contents = contents
|
||||||
|
|
||||||
if pkgFormat == "rpm" {
|
if len(vars.AutoProv) == 1 && decoder.IsTruthy(vars.AutoProv[0]) {
|
||||||
err = rpmFindProvides(ctx, pkgInfo, dirs)
|
if pkgFormat == "rpm" {
|
||||||
if err != nil {
|
err = rpmFindProvides(ctx, pkgInfo, dirs)
|
||||||
return nil, err
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
slog.Info(gotext.Get("AutoProv is not implemented for this package format, so it's skipped"))
|
||||||
}
|
}
|
||||||
err = rpmFindRequires(ctx, pkgInfo, dirs)
|
}
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
if len(vars.AutoReq) == 1 && decoder.IsTruthy(vars.AutoReq[0]) {
|
||||||
|
if pkgFormat == "rpm" {
|
||||||
|
err = rpmFindRequires(ctx, pkgInfo, dirs)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
slog.Info(gotext.Get("AutoReq is not implemented for this package format, so it's skipped"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -560,21 +622,27 @@ func buildPkgMetadata(ctx context.Context, vars *types.BuildVars, dirs types.Dir
|
|||||||
|
|
||||||
// Функция buildContents создает секцию содержимого пакета, которая содержит файлы,
|
// Функция buildContents создает секцию содержимого пакета, которая содержит файлы,
|
||||||
// которые будут включены в конечный пакет.
|
// которые будут включены в конечный пакет.
|
||||||
func buildContents(vars *types.BuildVars, dirs types.Directories) ([]*files.Content, error) {
|
func buildContents(vars *types.BuildVars, dirs types.Directories, preferedContents *[]string) ([]*files.Content, error) {
|
||||||
contents := []*files.Content{}
|
contents := []*files.Content{}
|
||||||
err := filepath.Walk(dirs.PkgDir, func(path string, fi os.FileInfo, err error) error {
|
|
||||||
trimmed := strings.TrimPrefix(path, dirs.PkgDir)
|
processPath := func(path, trimmed string, prefered bool) error {
|
||||||
|
fi, err := os.Lstat(path)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
if fi.IsDir() {
|
if fi.IsDir() {
|
||||||
f, err := os.Open(path)
|
f, err := os.Open(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
defer f.Close()
|
||||||
|
|
||||||
// Если директория пустая, пропускаем её
|
if !prefered {
|
||||||
_, err = f.Readdirnames(1)
|
_, err = f.Readdirnames(1)
|
||||||
if err != io.EOF {
|
if err != io.EOF {
|
||||||
return nil
|
return nil
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
contents = append(contents, &files.Content{
|
contents = append(contents, &files.Content{
|
||||||
@ -585,16 +653,14 @@ func buildContents(vars *types.BuildVars, dirs types.Directories) ([]*files.Cont
|
|||||||
MTime: fi.ModTime(),
|
MTime: fi.ModTime(),
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
return nil
|
||||||
return f.Close()
|
|
||||||
}
|
}
|
||||||
// Если файл является символической ссылкой, прорабатываем это
|
|
||||||
if fi.Mode()&os.ModeSymlink != 0 {
|
if fi.Mode()&os.ModeSymlink != 0 {
|
||||||
link, err := os.Readlink(path)
|
link, err := os.Readlink(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
// Удаляем pkgdir из пути символической ссылки
|
|
||||||
link = strings.TrimPrefix(link, dirs.PkgDir)
|
link = strings.TrimPrefix(link, dirs.PkgDir)
|
||||||
|
|
||||||
contents = append(contents, &files.Content{
|
contents = append(contents, &files.Content{
|
||||||
@ -606,10 +672,9 @@ func buildContents(vars *types.BuildVars, dirs types.Directories) ([]*files.Cont
|
|||||||
Mode: fi.Mode(),
|
Mode: fi.Mode(),
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
// Обрабатываем обычные файлы
|
|
||||||
fileContent := &files.Content{
|
fileContent := &files.Content{
|
||||||
Source: path,
|
Source: path,
|
||||||
Destination: trimmed,
|
Destination: trimmed,
|
||||||
@ -620,23 +685,42 @@ func buildContents(vars *types.BuildVars, dirs types.Directories) ([]*files.Cont
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
// Если файл должен быть сохранен, установите его тип как config|noreplace
|
|
||||||
if slices.Contains(vars.Backup, trimmed) {
|
if slices.Contains(vars.Backup, trimmed) {
|
||||||
fileContent.Type = "config|noreplace"
|
fileContent.Type = "config|noreplace"
|
||||||
}
|
}
|
||||||
|
|
||||||
contents = append(contents, fileContent)
|
contents = append(contents, fileContent)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
})
|
}
|
||||||
return contents, err
|
|
||||||
|
if preferedContents != nil {
|
||||||
|
for _, trimmed := range *preferedContents {
|
||||||
|
path := filepath.Join(dirs.PkgDir, trimmed)
|
||||||
|
if err := processPath(path, trimmed, true); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
err := filepath.Walk(dirs.PkgDir, func(path string, fi os.FileInfo, err error) error {
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
trimmed := strings.TrimPrefix(path, dirs.PkgDir)
|
||||||
|
return processPath(path, trimmed, false)
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return contents, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Функция removeBuildDeps спрашивает у пользователя, хочет ли он удалить зависимости,
|
// Функция removeBuildDeps спрашивает у пользователя, хочет ли он удалить зависимости,
|
||||||
// установленные для сборки. Если да, использует менеджер пакетов для их удаления.
|
// установленные для сборки. Если да, использует менеджер пакетов для их удаления.
|
||||||
func removeBuildDeps(ctx context.Context, buildDeps []string, opts types.BuildOpts) error {
|
func removeBuildDeps(ctx context.Context, buildDeps []string, opts types.BuildOpts) error {
|
||||||
if len(buildDeps) > 0 {
|
if len(buildDeps) > 0 {
|
||||||
remove, err := cliutils.YesNoPrompt(ctx, "Would you like to remove the build dependencies?", opts.Interactive, false)
|
remove, err := cliutils.YesNoPrompt(ctx, gotext.Get("Would you like to remove the build dependencies?"), opts.Interactive, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -741,9 +825,9 @@ func createBuildEnvVars(info *distro.OSRelease, dirs types.Directories) []string
|
|||||||
|
|
||||||
// Функция getSources загружает исходники скрипта.
|
// Функция getSources загружает исходники скрипта.
|
||||||
func getSources(ctx context.Context, dirs types.Directories, bv *types.BuildVars) error {
|
func getSources(ctx context.Context, dirs types.Directories, bv *types.BuildVars) error {
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
if len(bv.Sources) != len(bv.Checksums) {
|
if len(bv.Sources) != len(bv.Checksums) {
|
||||||
log.Fatal("The checksums array must be the same length as sources").Send()
|
slog.Error(gotext.Get("The checksums array must be the same length as sources"))
|
||||||
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
for i, src := range bv.Sources {
|
for i, src := range bv.Sources {
|
||||||
@ -832,21 +916,22 @@ func setVersion(ctx context.Context, r *interp.Runner, to string) error {
|
|||||||
return r.Run(ctx, fl)
|
return r.Run(ctx, fl)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Функция removeAlreadyInstalled возвращает карту без каких-либо зависимостей, которые уже установлены.
|
// Returns not installed dependencies
|
||||||
func removeAlreadyInstalled(found map[string][]db.Package, installed map[string]string) map[string][]db.Package {
|
func removeAlreadyInstalled(opts types.BuildOpts, dependencies []string) ([]string, error) {
|
||||||
filteredPackages := make(map[string][]db.Package)
|
filteredPackages := []string{}
|
||||||
|
|
||||||
for name, pkgList := range found {
|
for _, dep := range dependencies {
|
||||||
filteredPkgList := []db.Package{}
|
installed, err := opts.Manager.IsInstalled(dep)
|
||||||
for _, pkg := range pkgList {
|
if err != nil {
|
||||||
if _, isInstalled := installed[pkg.Name]; !isInstalled {
|
return nil, err
|
||||||
filteredPkgList = append(filteredPkgList, pkg)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
filteredPackages[name] = filteredPkgList
|
if installed {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
filteredPackages = append(filteredPackages, dep)
|
||||||
}
|
}
|
||||||
|
|
||||||
return filteredPackages
|
return filteredPackages, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Функция packageNames возвращает имена всех предоставленных пакетов.
|
// Функция packageNames возвращает имена всех предоставленных пакетов.
|
||||||
|
225
pkg/build/build_internal_test.go
Normal file
225
pkg/build/build_internal_test.go
Normal file
@ -0,0 +1,225 @@
|
|||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package build
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
|
||||||
|
)
|
||||||
|
|
||||||
|
type TestPackageFinder struct {
|
||||||
|
FindPkgsFunc func(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (pf *TestPackageFinder) FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error) {
|
||||||
|
if pf.FindPkgsFunc != nil {
|
||||||
|
return pf.FindPkgsFunc(ctx, pkgs)
|
||||||
|
}
|
||||||
|
return map[string][]db.Package{}, []string{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type TestManager struct {
|
||||||
|
NameFunc func() string
|
||||||
|
FormatFunc func() string
|
||||||
|
ExistsFunc func() bool
|
||||||
|
SetRootCmdFunc func(cmd string)
|
||||||
|
SyncFunc func(opts *manager.Opts) error
|
||||||
|
InstallFunc func(opts *manager.Opts, pkgs ...string) error
|
||||||
|
RemoveFunc func(opts *manager.Opts, pkgs ...string) error
|
||||||
|
UpgradeFunc func(opts *manager.Opts, pkgs ...string) error
|
||||||
|
InstallLocalFunc func(opts *manager.Opts, files ...string) error
|
||||||
|
UpgradeAllFunc func(opts *manager.Opts) error
|
||||||
|
ListInstalledFunc func(opts *manager.Opts) (map[string]string, error)
|
||||||
|
IsInstalledFunc func(pkg string) (bool, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *TestManager) Name() string {
|
||||||
|
if m.NameFunc != nil {
|
||||||
|
return m.NameFunc()
|
||||||
|
}
|
||||||
|
return "TestManager"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *TestManager) Format() string {
|
||||||
|
if m.FormatFunc != nil {
|
||||||
|
return m.FormatFunc()
|
||||||
|
}
|
||||||
|
return "testpkg"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *TestManager) Exists() bool {
|
||||||
|
if m.ExistsFunc != nil {
|
||||||
|
return m.ExistsFunc()
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *TestManager) SetRootCmd(cmd string) {
|
||||||
|
if m.SetRootCmdFunc != nil {
|
||||||
|
m.SetRootCmdFunc(cmd)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *TestManager) Sync(opts *manager.Opts) error {
|
||||||
|
if m.SyncFunc != nil {
|
||||||
|
return m.SyncFunc(opts)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *TestManager) Install(opts *manager.Opts, pkgs ...string) error {
|
||||||
|
if m.InstallFunc != nil {
|
||||||
|
return m.InstallFunc(opts, pkgs...)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *TestManager) Remove(opts *manager.Opts, pkgs ...string) error {
|
||||||
|
if m.RemoveFunc != nil {
|
||||||
|
return m.RemoveFunc(opts, pkgs...)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *TestManager) Upgrade(opts *manager.Opts, pkgs ...string) error {
|
||||||
|
if m.UpgradeFunc != nil {
|
||||||
|
return m.UpgradeFunc(opts, pkgs...)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *TestManager) InstallLocal(opts *manager.Opts, files ...string) error {
|
||||||
|
if m.InstallLocalFunc != nil {
|
||||||
|
return m.InstallLocalFunc(opts, files...)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *TestManager) UpgradeAll(opts *manager.Opts) error {
|
||||||
|
if m.UpgradeAllFunc != nil {
|
||||||
|
return m.UpgradeAllFunc(opts)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *TestManager) ListInstalled(opts *manager.Opts) (map[string]string, error) {
|
||||||
|
if m.ListInstalledFunc != nil {
|
||||||
|
return m.ListInstalledFunc(opts)
|
||||||
|
}
|
||||||
|
return map[string]string{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *TestManager) IsInstalled(pkg string) (bool, error) {
|
||||||
|
if m.IsInstalledFunc != nil {
|
||||||
|
return m.IsInstalledFunc(pkg)
|
||||||
|
}
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestInstallBuildDeps(t *testing.T) {
|
||||||
|
type testEnv struct {
|
||||||
|
pf PackageFinder
|
||||||
|
vars *types.BuildVars
|
||||||
|
opts types.BuildOpts
|
||||||
|
|
||||||
|
// Contains pkgs captured by FindPkgsFunc
|
||||||
|
capturedPkgs []string
|
||||||
|
}
|
||||||
|
|
||||||
|
type testCase struct {
|
||||||
|
Name string
|
||||||
|
Prepare func() *testEnv
|
||||||
|
Expected func(t *testing.T, e *testEnv, res []string, err error)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range []testCase{
|
||||||
|
{
|
||||||
|
Name: "install only needed deps",
|
||||||
|
Prepare: func() *testEnv {
|
||||||
|
pf := TestPackageFinder{}
|
||||||
|
vars := types.BuildVars{}
|
||||||
|
m := TestManager{}
|
||||||
|
opts := types.BuildOpts{
|
||||||
|
Manager: &m,
|
||||||
|
Interactive: false,
|
||||||
|
}
|
||||||
|
|
||||||
|
env := &testEnv{
|
||||||
|
pf: &pf,
|
||||||
|
vars: &vars,
|
||||||
|
opts: opts,
|
||||||
|
capturedPkgs: []string{},
|
||||||
|
}
|
||||||
|
|
||||||
|
pf.FindPkgsFunc = func(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error) {
|
||||||
|
env.capturedPkgs = append(env.capturedPkgs, pkgs...)
|
||||||
|
result := make(map[string][]db.Package)
|
||||||
|
result["bar"] = []db.Package{{
|
||||||
|
Name: "bar-pkg",
|
||||||
|
}}
|
||||||
|
result["buz"] = []db.Package{{
|
||||||
|
Name: "buz-pkg",
|
||||||
|
}}
|
||||||
|
|
||||||
|
return result, []string{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
vars.BuildDepends = []string{
|
||||||
|
"foo",
|
||||||
|
"bar",
|
||||||
|
"buz",
|
||||||
|
}
|
||||||
|
m.IsInstalledFunc = func(pkg string) (bool, error) {
|
||||||
|
if pkg == "foo" {
|
||||||
|
return true, nil
|
||||||
|
} else {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return env
|
||||||
|
},
|
||||||
|
Expected: func(t *testing.T, e *testEnv, res []string, err error) {
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Len(t, res, 2)
|
||||||
|
assert.ElementsMatch(t, res, []string{"bar-pkg", "buz-pkg"})
|
||||||
|
|
||||||
|
assert.ElementsMatch(t, e.capturedPkgs, []string{"bar", "buz"})
|
||||||
|
},
|
||||||
|
},
|
||||||
|
} {
|
||||||
|
t.Run(tc.Name, func(tt *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
env := tc.Prepare()
|
||||||
|
|
||||||
|
result, err := installBuildDeps(
|
||||||
|
ctx,
|
||||||
|
env.pf,
|
||||||
|
env.vars,
|
||||||
|
env.opts,
|
||||||
|
)
|
||||||
|
|
||||||
|
tc.Expected(tt, env, result, err)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
@ -1,23 +1,38 @@
|
|||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package build
|
package build
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
|
"log/slog"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path"
|
"path"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/goreleaser/nfpm/v2"
|
"github.com/goreleaser/nfpm/v2"
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/types"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func rpmFindDependencies(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Directories, command string, updateFunc func(string)) error {
|
func rpmFindDependencies(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Directories, command string, updateFunc func(string)) error {
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
|
|
||||||
if _, err := exec.LookPath(command); err != nil {
|
if _, err := exec.LookPath(command); err != nil {
|
||||||
log.Info("Command not found on the system").Str("command", command).Send()
|
slog.Info(gotext.Get("Command not found on the system"), "command", command)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -48,7 +63,7 @@ func rpmFindDependencies(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Dir
|
|||||||
cmd.Stdout = &out
|
cmd.Stdout = &out
|
||||||
cmd.Stderr = &stderr
|
cmd.Stderr = &stderr
|
||||||
if err := cmd.Run(); err != nil {
|
if err := cmd.Run(); err != nil {
|
||||||
log.Error(stderr.String())
|
slog.Error(stderr.String())
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -63,19 +78,15 @@ func rpmFindDependencies(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Dir
|
|||||||
}
|
}
|
||||||
|
|
||||||
func rpmFindProvides(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Directories) error {
|
func rpmFindProvides(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Directories) error {
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
|
|
||||||
return rpmFindDependencies(ctx, pkgInfo, dirs, "/usr/lib/rpm/find-provides", func(dep string) {
|
return rpmFindDependencies(ctx, pkgInfo, dirs, "/usr/lib/rpm/find-provides", func(dep string) {
|
||||||
log.Info("Provided dependency found").Str("dep", dep).Send()
|
slog.Info(gotext.Get("Provided dependency found"), "dep", dep)
|
||||||
pkgInfo.Overridables.Provides = append(pkgInfo.Overridables.Provides, dep)
|
pkgInfo.Overridables.Provides = append(pkgInfo.Overridables.Provides, dep)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func rpmFindRequires(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Directories) error {
|
func rpmFindRequires(ctx context.Context, pkgInfo *nfpm.Info, dirs types.Directories) error {
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
|
|
||||||
return rpmFindDependencies(ctx, pkgInfo, dirs, "/usr/lib/rpm/find-requires", func(dep string) {
|
return rpmFindDependencies(ctx, pkgInfo, dirs, "/usr/lib/rpm/find-requires", func(dep string) {
|
||||||
log.Info("Required dependency found").Str("dep", dep).Send()
|
slog.Info(gotext.Get("Required dependency found"), "dep", dep)
|
||||||
pkgInfo.Overridables.Depends = append(pkgInfo.Overridables.Depends, dep)
|
pkgInfo.Overridables.Depends = append(pkgInfo.Overridables.Depends, dep)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -1,54 +1,46 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* ALR - Любой Linux Репозиторий
|
//
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
// ALR - Any Linux Repository
|
||||||
*
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* This program is free software: you can redistribute it and/or modify
|
//
|
||||||
* Это программное обеспечение является свободным: вы можете распространять его и/или изменять
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
// it under the terms of the GNU General Public License as published by
|
||||||
* на условиях GNU General Public License, опубликованной
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// (at your option) any later version.
|
||||||
* Free Software Foundation, либо версии 3 лицензии, либо
|
//
|
||||||
* (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
|
||||||
* This program is distributed in the hope that it will be useful,
|
// GNU General Public License for more details.
|
||||||
* Это программное обеспечение распространяется в надежде, что оно будет полезным,
|
//
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
// You should have received a copy of the GNU General Public License
|
||||||
* но БЕЗ КАКОЙ-ЛИБО ГАРАНТИИ; даже без подразумеваемой гарантии
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* КОММЕРЧЕСКОЙ ПРИГОДНОСТИ или ПРИГОДНОСТИ ДЛЯ ОПРЕДЕЛЕННОЙ ЦЕЛИ.
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
* Подробности смотрите в GNU General Public License.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* Вы должны были получить копию GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
* вместе с этой программой. Если нет, посмотрите <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package build
|
package build
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"log/slog"
|
||||||
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/config"
|
"github.com/leonelquinteros/gotext"
|
||||||
"plemya-x.ru/alr/internal/db"
|
|
||||||
"plemya-x.ru/alr/internal/types"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
// InstallPkgs устанавливает нативные пакеты с использованием менеджера пакетов,
|
// InstallPkgs устанавливает нативные пакеты с использованием менеджера пакетов,
|
||||||
// затем строит и устанавливает пакеты ALR
|
// затем строит и устанавливает пакеты ALR
|
||||||
func InstallPkgs(ctx context.Context, alrPkgs []db.Package, nativePkgs []string, opts types.BuildOpts) {
|
func InstallPkgs(ctx context.Context, alrPkgs []db.Package, nativePkgs []string, opts types.BuildOpts) {
|
||||||
log := loggerctx.From(ctx) // Инициализируем логгер из контекста
|
|
||||||
|
|
||||||
if len(nativePkgs) > 0 {
|
if len(nativePkgs) > 0 {
|
||||||
err := opts.Manager.Install(nil, nativePkgs...)
|
err := opts.Manager.Install(nil, nativePkgs...)
|
||||||
// Если есть нативные пакеты, выполняем их установку
|
// Если есть нативные пакеты, выполняем их установку
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error installing native packages").Err(err).Send()
|
slog.Error(gotext.Get("Error installing native packages"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
// Логируем и завершаем выполнение при ошибке
|
// Логируем и завершаем выполнение при ошибке
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -71,20 +63,21 @@ func GetScriptPaths(ctx context.Context, pkgs []db.Package) []string {
|
|||||||
|
|
||||||
// InstallScripts строит и устанавливает переданные alr скрипты сборки
|
// InstallScripts строит и устанавливает переданные alr скрипты сборки
|
||||||
func InstallScripts(ctx context.Context, scripts []string, opts types.BuildOpts) {
|
func InstallScripts(ctx context.Context, scripts []string, opts types.BuildOpts) {
|
||||||
log := loggerctx.From(ctx) // Получаем логгер из контекста
|
|
||||||
for _, script := range scripts {
|
for _, script := range scripts {
|
||||||
opts.Script = script // Устанавливаем текущий скрипт в опции
|
opts.Script = script // Устанавливаем текущий скрипт в опции
|
||||||
builtPkgs, _, err := BuildPackage(ctx, opts)
|
builtPkgs, _, err := BuildPackage(ctx, opts)
|
||||||
// Выполняем сборку пакета
|
// Выполняем сборку пакета
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error building package").Err(err).Send()
|
slog.Error(gotext.Get("Error building package"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
// Логируем и завершаем выполнение при ошибке сборки
|
// Логируем и завершаем выполнение при ошибке сборки
|
||||||
}
|
}
|
||||||
|
|
||||||
err = opts.Manager.InstallLocal(nil, builtPkgs...)
|
err = opts.Manager.InstallLocal(nil, builtPkgs...)
|
||||||
// Устанавливаем локально собранные пакеты
|
// Устанавливаем локально собранные пакеты
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error installing package").Err(err).Send()
|
slog.Error(gotext.Get("Error installing package"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
// Логируем и завершаем выполнение при ошибке установки
|
// Логируем и завершаем выполнение при ошибке установки
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package distro
|
package distro
|
||||||
|
|
||||||
@ -27,7 +28,7 @@ import (
|
|||||||
"mvdan.cc/sh/v3/interp"
|
"mvdan.cc/sh/v3/interp"
|
||||||
"mvdan.cc/sh/v3/syntax"
|
"mvdan.cc/sh/v3/syntax"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/shutils/handlers"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
|
||||||
)
|
)
|
||||||
|
|
||||||
// OSRelease contains information from an os-release file
|
// OSRelease contains information from an os-release file
|
||||||
@ -43,6 +44,7 @@ type OSRelease struct {
|
|||||||
SupportURL string
|
SupportURL string
|
||||||
BugReportURL string
|
BugReportURL string
|
||||||
Logo string
|
Logo string
|
||||||
|
PlatformID string
|
||||||
}
|
}
|
||||||
|
|
||||||
var parsed *OSRelease
|
var parsed *OSRelease
|
||||||
@ -101,6 +103,7 @@ func ParseOSRelease(ctx context.Context) (*OSRelease, error) {
|
|||||||
SupportURL: runner.Vars["SUPPORT_URL"].Str,
|
SupportURL: runner.Vars["SUPPORT_URL"].Str,
|
||||||
BugReportURL: runner.Vars["BUG_REPORT_URL"].Str,
|
BugReportURL: runner.Vars["BUG_REPORT_URL"].Str,
|
||||||
Logo: runner.Vars["LOGO"].Str,
|
Logo: runner.Vars["LOGO"].Str,
|
||||||
|
PlatformID: runner.Vars["PLATFORM_ID"].Str,
|
||||||
}
|
}
|
||||||
|
|
||||||
distroUpdated := false
|
distroUpdated := false
|
||||||
|
@ -1,3 +1,22 @@
|
|||||||
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
|
//
|
||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package gen
|
package gen
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
@ -1,3 +1,22 @@
|
|||||||
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
|
//
|
||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package gen
|
package gen
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
@ -1,3 +1,22 @@
|
|||||||
|
# This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
|
# It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
|
#
|
||||||
|
# ALR - Any Linux Repository
|
||||||
|
# Copyright (C) 2025 Евгений Храмов
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
name='{{.Info.Name | tolower}}'
|
name='{{.Info.Name | tolower}}'
|
||||||
version='{{.Info.Version}}'
|
version='{{.Info.Version}}'
|
||||||
release='1'
|
release='1'
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
package loggerctx
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
|
|
||||||
"go.elara.ws/logger"
|
|
||||||
)
|
|
||||||
|
|
||||||
// loggerCtxKey is used as the context key for loggers
|
|
||||||
type loggerCtxKey struct{}
|
|
||||||
|
|
||||||
// With returns a copy of ctx containing log
|
|
||||||
func With(ctx context.Context, log logger.Logger) context.Context {
|
|
||||||
return context.WithValue(ctx, loggerCtxKey{}, log)
|
|
||||||
}
|
|
||||||
|
|
||||||
// From attempts to get a logger from ctx. If ctx doesn't
|
|
||||||
// contain a logger, it returns a nop logger.
|
|
||||||
func From(ctx context.Context) logger.Logger {
|
|
||||||
if val := ctx.Value(loggerCtxKey{}); val != nil {
|
|
||||||
if log, ok := val.(logger.Logger); ok && log != nil {
|
|
||||||
return log
|
|
||||||
} else {
|
|
||||||
return logger.NewNop()
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return logger.NewNop()
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package manager
|
package manager
|
||||||
|
|
||||||
@ -148,6 +149,21 @@ func (a *APK) ListInstalled(opts *Opts) (map[string]string, error) {
|
|||||||
return out, nil
|
return out, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a *APK) IsInstalled(pkg string) (bool, error) {
|
||||||
|
cmd := exec.Command("apk", "info", "--installed", pkg)
|
||||||
|
output, err := cmd.CombinedOutput()
|
||||||
|
if err != nil {
|
||||||
|
if exitErr, ok := err.(*exec.ExitError); ok {
|
||||||
|
// Exit code 1 means the package is not installed
|
||||||
|
if exitErr.ExitCode() == 1 {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false, fmt.Errorf("apk: isinstalled: %w, output: %s", err, output)
|
||||||
|
}
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (a *APK) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
|
func (a *APK) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
|
||||||
var cmd *exec.Cmd
|
var cmd *exec.Cmd
|
||||||
if opts.AsRoot {
|
if opts.AsRoot {
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package manager
|
package manager
|
||||||
|
|
||||||
@ -134,6 +135,21 @@ func (a *APT) ListInstalled(opts *Opts) (map[string]string, error) {
|
|||||||
return out, nil
|
return out, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a *APT) IsInstalled(pkg string) (bool, error) {
|
||||||
|
cmd := exec.Command("dpkg-query", "-l", pkg)
|
||||||
|
output, err := cmd.CombinedOutput()
|
||||||
|
if err != nil {
|
||||||
|
if exitErr, ok := err.(*exec.ExitError); ok {
|
||||||
|
// Exit code 1 means the package is not installed
|
||||||
|
if exitErr.ExitCode() == 1 {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false, fmt.Errorf("apt: isinstalled: %w, output: %s", err, output)
|
||||||
|
}
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (a *APT) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
|
func (a *APT) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
|
||||||
var cmd *exec.Cmd
|
var cmd *exec.Cmd
|
||||||
if opts.AsRoot {
|
if opts.AsRoot {
|
||||||
|
@ -1,25 +1,22 @@
|
|||||||
/*
|
// ALR - Any Linux Repository
|
||||||
* ALR - Any Linux Repository
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// it under the terms of the GNU General Public License as published by
|
||||||
* it under the terms of the GNU General Public License as published by
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// (at your option) any later version.
|
||||||
* (at your option) any later version.
|
//
|
||||||
*
|
// This program is distributed in the hope that it will be useful,
|
||||||
* This program is distributed in the hope that it will be useful,
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// GNU General Public License for more details.
|
||||||
* GNU General Public License for more details.
|
//
|
||||||
*
|
// You should have received a copy of the GNU General Public License
|
||||||
* You should have received a copy of the GNU General Public License
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package manager
|
package manager
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strings"
|
"strings"
|
||||||
@ -27,6 +24,7 @@ import (
|
|||||||
|
|
||||||
// APTRpm represents the APT-RPM package manager
|
// APTRpm represents the APT-RPM package manager
|
||||||
type APTRpm struct {
|
type APTRpm struct {
|
||||||
|
CommonRPM
|
||||||
rootCmd string
|
rootCmd string
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -108,38 +106,6 @@ func (a *APTRpm) UpgradeAll(opts *Opts) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (y *APTRpm) ListInstalled(opts *Opts) (map[string]string, error) {
|
|
||||||
out := map[string]string{}
|
|
||||||
cmd := exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
|
|
||||||
|
|
||||||
stdout, err := cmd.StdoutPipe()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
err = cmd.Start()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
scanner := bufio.NewScanner(stdout)
|
|
||||||
for scanner.Scan() {
|
|
||||||
name, version, ok := strings.Cut(scanner.Text(), "\u200b")
|
|
||||||
if !ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
version = strings.TrimPrefix(version, "0:")
|
|
||||||
out[name] = version
|
|
||||||
}
|
|
||||||
|
|
||||||
err = scanner.Err()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *APTRpm) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
|
func (a *APTRpm) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
|
||||||
var cmd *exec.Cmd
|
var cmd *exec.Cmd
|
||||||
if opts.AsRoot {
|
if opts.AsRoot {
|
||||||
|
72
pkg/manager/common_rpm.go
Normal file
72
pkg/manager/common_rpm.go
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package manager
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"fmt"
|
||||||
|
"os/exec"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
type CommonRPM struct{}
|
||||||
|
|
||||||
|
func (c *CommonRPM) ListInstalled(opts *Opts) (map[string]string, error) {
|
||||||
|
out := map[string]string{}
|
||||||
|
cmd := exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
|
||||||
|
|
||||||
|
stdout, err := cmd.StdoutPipe()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
err = cmd.Start()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
scanner := bufio.NewScanner(stdout)
|
||||||
|
for scanner.Scan() {
|
||||||
|
name, version, ok := strings.Cut(scanner.Text(), "\u200b")
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
version = strings.TrimPrefix(version, "0:")
|
||||||
|
out[name] = version
|
||||||
|
}
|
||||||
|
|
||||||
|
err = scanner.Err()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *CommonRPM) IsInstalled(pkg string) (bool, error) {
|
||||||
|
cmd := exec.Command("rpm", "-q", "--whatprovides", pkg)
|
||||||
|
output, err := cmd.CombinedOutput()
|
||||||
|
if err != nil {
|
||||||
|
if exitErr, ok := err.(*exec.ExitError); ok {
|
||||||
|
if exitErr.ExitCode() == 1 {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false, fmt.Errorf("rpm: isinstalled: %w, output: %s", err, output)
|
||||||
|
}
|
||||||
|
return true, nil
|
||||||
|
}
|
@ -19,14 +19,13 @@
|
|||||||
package manager
|
package manager
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strings"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// DNF представляет менеджер пакетов DNF
|
// DNF представляет менеджер пакетов DNF
|
||||||
type DNF struct {
|
type DNF struct {
|
||||||
|
CommonRPM
|
||||||
rootCmd string // rootCmd хранит команду, используемую для выполнения команд с правами root
|
rootCmd string // rootCmd хранит команду, используемую для выполнения команд с правами root
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -120,39 +119,6 @@ func (d *DNF) UpgradeAll(opts *Opts) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListInstalled возвращает список установленных пакетов и их версий
|
|
||||||
func (d *DNF) ListInstalled(opts *Opts) (map[string]string, error) {
|
|
||||||
out := map[string]string{}
|
|
||||||
cmd := exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
|
|
||||||
|
|
||||||
stdout, err := cmd.StdoutPipe()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
err = cmd.Start()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
scanner := bufio.NewScanner(stdout)
|
|
||||||
for scanner.Scan() {
|
|
||||||
name, version, ok := strings.Cut(scanner.Text(), "\u200b")
|
|
||||||
if !ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
version = strings.TrimPrefix(version, "0:")
|
|
||||||
out[name] = version
|
|
||||||
}
|
|
||||||
|
|
||||||
err = scanner.Err()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// getCmd создает и возвращает команду exec.Cmd для менеджера пакетов DNF
|
// getCmd создает и возвращает команду exec.Cmd для менеджера пакетов DNF
|
||||||
func (d *DNF) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
|
func (d *DNF) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
|
||||||
var cmd *exec.Cmd
|
var cmd *exec.Cmd
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package manager
|
package manager
|
||||||
|
|
||||||
@ -79,6 +80,8 @@ type Manager interface {
|
|||||||
UpgradeAll(*Opts) error
|
UpgradeAll(*Opts) error
|
||||||
// ListInstalled returns all installed packages mapped to their versions
|
// ListInstalled returns all installed packages mapped to their versions
|
||||||
ListInstalled(*Opts) (map[string]string, error)
|
ListInstalled(*Opts) (map[string]string, error)
|
||||||
|
//
|
||||||
|
IsInstalled(string) (bool, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Detect returns the package manager detected on the system
|
// Detect returns the package manager detected on the system
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package manager
|
package manager
|
||||||
|
|
||||||
@ -141,6 +142,21 @@ func (p *Pacman) ListInstalled(opts *Opts) (map[string]string, error) {
|
|||||||
return out, nil
|
return out, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (p *Pacman) IsInstalled(pkg string) (bool, error) {
|
||||||
|
cmd := exec.Command("pacman", "-Q", pkg)
|
||||||
|
output, err := cmd.CombinedOutput()
|
||||||
|
if err != nil {
|
||||||
|
// Pacman returns exit code 1 if the package is not found
|
||||||
|
if exitErr, ok := err.(*exec.ExitError); ok {
|
||||||
|
if exitErr.ExitCode() == 1 {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false, fmt.Errorf("pacman: isinstalled: %w, output: %s", err, output)
|
||||||
|
}
|
||||||
|
return true, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (p *Pacman) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
|
func (p *Pacman) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
|
||||||
var cmd *exec.Cmd
|
var cmd *exec.Cmd
|
||||||
if opts.AsRoot {
|
if opts.AsRoot {
|
||||||
|
@ -1,32 +1,33 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package manager
|
package manager
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strings"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// YUM represents the YUM package manager
|
// YUM represents the YUM package manager
|
||||||
type YUM struct {
|
type YUM struct {
|
||||||
|
CommonRPM
|
||||||
|
|
||||||
rootCmd string
|
rootCmd string
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -110,38 +111,6 @@ func (y *YUM) UpgradeAll(opts *Opts) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (y *YUM) ListInstalled(opts *Opts) (map[string]string, error) {
|
|
||||||
out := map[string]string{}
|
|
||||||
cmd := exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
|
|
||||||
|
|
||||||
stdout, err := cmd.StdoutPipe()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
err = cmd.Start()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
scanner := bufio.NewScanner(stdout)
|
|
||||||
for scanner.Scan() {
|
|
||||||
name, version, ok := strings.Cut(scanner.Text(), "\u200b")
|
|
||||||
if !ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
version = strings.TrimPrefix(version, "0:")
|
|
||||||
out[name] = version
|
|
||||||
}
|
|
||||||
|
|
||||||
err = scanner.Err()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (y *YUM) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
|
func (y *YUM) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
|
||||||
var cmd *exec.Cmd
|
var cmd *exec.Cmd
|
||||||
if opts.AsRoot {
|
if opts.AsRoot {
|
||||||
|
@ -1,32 +1,32 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package manager
|
package manager
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"strings"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Zypper represents the Zypper package manager
|
// Zypper represents the Zypper package manager
|
||||||
type Zypper struct {
|
type Zypper struct {
|
||||||
|
CommonRPM
|
||||||
rootCmd string
|
rootCmd string
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -110,38 +110,6 @@ func (z *Zypper) UpgradeAll(opts *Opts) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (z *Zypper) ListInstalled(opts *Opts) (map[string]string, error) {
|
|
||||||
out := map[string]string{}
|
|
||||||
cmd := exec.Command("rpm", "-qa", "--queryformat", "%{NAME}\u200b%|EPOCH?{%{EPOCH}:}:{}|%{VERSION}-%{RELEASE}\\n")
|
|
||||||
|
|
||||||
stdout, err := cmd.StdoutPipe()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
err = cmd.Start()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
scanner := bufio.NewScanner(stdout)
|
|
||||||
for scanner.Scan() {
|
|
||||||
name, version, ok := strings.Cut(scanner.Text(), "\u200b")
|
|
||||||
if !ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
version = strings.TrimPrefix(version, "0:")
|
|
||||||
out[name] = version
|
|
||||||
}
|
|
||||||
|
|
||||||
err = scanner.Err()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (z *Zypper) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
|
func (z *Zypper) getCmd(opts *Opts, mgrCmd string, args ...string) *exec.Cmd {
|
||||||
var cmd *exec.Cmd
|
var cmd *exec.Cmd
|
||||||
if opts.AsRoot {
|
if opts.AsRoot {
|
||||||
|
@ -1,33 +1,31 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package repos
|
package repos
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/db"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
)
|
)
|
||||||
|
|
||||||
// FindPkgs looks for packages matching the inputs inside the database.
|
func (rs *Repos) FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error) {
|
||||||
// It returns a map that maps the package name input to any packages found for it.
|
|
||||||
// It also returns a slice that contains the names of all packages that were not found.
|
|
||||||
func FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error) {
|
|
||||||
found := map[string][]db.Package{}
|
found := map[string][]db.Package{}
|
||||||
notFound := []string(nil)
|
notFound := []string(nil)
|
||||||
|
|
||||||
@ -36,7 +34,7 @@ func FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []st
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
result, err := db.GetPkgs(ctx, "json_array_contains(provides, ?)", pkgName)
|
result, err := rs.db.GetPkgs(ctx, "json_array_contains(provides, ?)", pkgName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
@ -55,7 +53,7 @@ func FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []st
|
|||||||
result.Close()
|
result.Close()
|
||||||
|
|
||||||
if added == 0 {
|
if added == 0 {
|
||||||
result, err := db.GetPkgs(ctx, "name LIKE ?", pkgName)
|
result, err := rs.db.GetPkgs(ctx, "name LIKE ?", pkgName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
@ -1,47 +1,44 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package repos_test
|
package repos_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/db"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
"plemya-x.ru/alr/internal/types"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
|
||||||
"plemya-x.ru/alr/pkg/repos"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestFindPkgs(t *testing.T) {
|
func TestFindPkgs(t *testing.T) {
|
||||||
_, err := db.Open(":memory:")
|
e := prepare(t)
|
||||||
if err != nil {
|
defer cleanup(t, e)
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
|
||||||
}
|
|
||||||
defer db.Close()
|
|
||||||
|
|
||||||
setCfgDirs(t)
|
rs := repos.New(
|
||||||
defer removeCacheDir(t)
|
e.Cfg,
|
||||||
|
e.Db,
|
||||||
|
)
|
||||||
|
|
||||||
ctx := context.Background()
|
err := rs.Pull(e.Ctx, []types.Repo{
|
||||||
|
|
||||||
err = repos.Pull(ctx, []types.Repo{
|
|
||||||
{
|
{
|
||||||
Name: "default",
|
Name: "default",
|
||||||
URL: "https://gitea.plemya-x.ru/xpamych/xpamych-alr-repo.git",
|
URL: "https://gitea.plemya-x.ru/xpamych/xpamych-alr-repo.git",
|
||||||
@ -51,7 +48,10 @@ func TestFindPkgs(t *testing.T) {
|
|||||||
t.Fatalf("Expected no error, got %s", err)
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
found, notFound, err := repos.FindPkgs([]string{"itd", "nonexistentpackage1", "nonexistentpackage2"})
|
found, notFound, err := rs.FindPkgs(
|
||||||
|
e.Ctx,
|
||||||
|
[]string{"alr", "nonexistentpackage1", "nonexistentpackage2"},
|
||||||
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
@ -64,33 +64,32 @@ func TestFindPkgs(t *testing.T) {
|
|||||||
t.Errorf("Expected 1 package found, got %d", len(found))
|
t.Errorf("Expected 1 package found, got %d", len(found))
|
||||||
}
|
}
|
||||||
|
|
||||||
itdPkgs, ok := found["itd"]
|
alrPkgs, ok := found["alr"]
|
||||||
if !ok {
|
if !ok {
|
||||||
t.Fatalf("Expected 'itd' packages to be found")
|
t.Fatalf("Expected 'alr' packages to be found")
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(itdPkgs) < 2 {
|
if len(alrPkgs) < 2 {
|
||||||
t.Errorf("Expected two 'itd' packages to be found")
|
t.Errorf("Expected two 'alr' packages to be found")
|
||||||
}
|
}
|
||||||
|
|
||||||
for i, pkg := range itdPkgs {
|
for i, pkg := range alrPkgs {
|
||||||
if !strings.HasPrefix(pkg.Name, "itd") {
|
if !strings.HasPrefix(pkg.Name, "alr") {
|
||||||
t.Errorf("Expected package name of all found packages to start with 'itd', got %s on element %d", pkg.Name, i)
|
t.Errorf("Expected package name of all found packages to start with 'alr', got %s on element %d", pkg.Name, i)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFindPkgsEmpty(t *testing.T) {
|
func TestFindPkgsEmpty(t *testing.T) {
|
||||||
_, err := db.Open(":memory:")
|
e := prepare(t)
|
||||||
if err != nil {
|
defer cleanup(t, e)
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
|
||||||
}
|
|
||||||
defer db.Close()
|
|
||||||
|
|
||||||
setCfgDirs(t)
|
rs := repos.New(
|
||||||
defer removeCacheDir(t)
|
e.Cfg,
|
||||||
|
e.Db,
|
||||||
|
)
|
||||||
|
|
||||||
err = db.InsertPackage(db.Package{
|
err := e.Db.InsertPackage(e.Ctx, db.Package{
|
||||||
Name: "test1",
|
Name: "test1",
|
||||||
Repository: "default",
|
Repository: "default",
|
||||||
Version: "0.0.1",
|
Version: "0.0.1",
|
||||||
@ -105,7 +104,7 @@ func TestFindPkgsEmpty(t *testing.T) {
|
|||||||
t.Fatalf("Expected no error, got %s", err)
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = db.InsertPackage(db.Package{
|
err = e.Db.InsertPackage(e.Ctx, db.Package{
|
||||||
Name: "test2",
|
Name: "test2",
|
||||||
Repository: "default",
|
Repository: "default",
|
||||||
Version: "0.0.1",
|
Version: "0.0.1",
|
||||||
@ -120,7 +119,7 @@ func TestFindPkgsEmpty(t *testing.T) {
|
|||||||
t.Fatalf("Expected no error, got %s", err)
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
found, notFound, err := repos.FindPkgs([]string{"test", ""})
|
found, notFound, err := rs.FindPkgs(e.Ctx, []string{"test", ""})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
@ -1,62 +1,69 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package repos
|
package repos
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"io"
|
"log/slog"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"reflect"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/go-git/go-billy/v5"
|
"github.com/go-git/go-billy/v5"
|
||||||
"github.com/go-git/go-billy/v5/osfs"
|
"github.com/go-git/go-billy/v5/osfs"
|
||||||
"github.com/go-git/go-git/v5"
|
"github.com/go-git/go-git/v5"
|
||||||
"github.com/go-git/go-git/v5/plumbing"
|
"github.com/go-git/go-git/v5/plumbing"
|
||||||
"github.com/go-git/go-git/v5/plumbing/format/diff"
|
"github.com/leonelquinteros/gotext"
|
||||||
"github.com/pelletier/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"go.elara.ws/vercmp"
|
"go.elara.ws/vercmp"
|
||||||
"mvdan.cc/sh/v3/expand"
|
"mvdan.cc/sh/v3/expand"
|
||||||
"mvdan.cc/sh/v3/interp"
|
"mvdan.cc/sh/v3/interp"
|
||||||
"mvdan.cc/sh/v3/syntax"
|
"mvdan.cc/sh/v3/syntax"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/internal/db"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
"plemya-x.ru/alr/internal/shutils/decoder"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
|
||||||
"plemya-x.ru/alr/internal/shutils/handlers"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
|
||||||
"plemya-x.ru/alr/internal/types"
|
|
||||||
"plemya-x.ru/alr/pkg/distro"
|
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type actionType uint8
|
||||||
|
|
||||||
|
const (
|
||||||
|
actionDelete actionType = iota
|
||||||
|
actionUpdate
|
||||||
|
)
|
||||||
|
|
||||||
|
type action struct {
|
||||||
|
Type actionType
|
||||||
|
File string
|
||||||
|
}
|
||||||
|
|
||||||
// Pull pulls the provided repositories. If a repo doesn't exist, it will be cloned
|
// Pull pulls the provided repositories. If a repo doesn't exist, it will be cloned
|
||||||
// and its packages will be written to the DB. If it does exist, it will be pulled.
|
// and its packages will be written to the DB. If it does exist, it will be pulled.
|
||||||
// In this case, only changed packages will be processed if possible.
|
// In this case, only changed packages will be processed if possible.
|
||||||
// If repos is set to nil, the repos in the ALR config will be used.
|
// If repos is set to nil, the repos in the ALR config will be used.
|
||||||
func Pull(ctx context.Context, repos []types.Repo) error {
|
func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error {
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
|
|
||||||
if repos == nil {
|
if repos == nil {
|
||||||
repos = config.Config(ctx).Repos
|
repos = rs.cfg.Repos(ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, repo := range repos {
|
for _, repo := range repos {
|
||||||
@ -65,7 +72,7 @@ func Pull(ctx context.Context, repos []types.Repo) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Info("Pulling repository").Str("name", repo.Name).Send()
|
slog.Info(gotext.Get("Pulling repository"), "name", repo.Name)
|
||||||
repoDir := filepath.Join(config.GetPaths(ctx).RepoDir, repo.Name)
|
repoDir := filepath.Join(config.GetPaths(ctx).RepoDir, repo.Name)
|
||||||
|
|
||||||
var repoFS billy.Filesystem
|
var repoFS billy.Filesystem
|
||||||
@ -89,14 +96,14 @@ func Pull(ctx context.Context, repos []types.Repo) error {
|
|||||||
|
|
||||||
err = w.PullContext(ctx, &git.PullOptions{Progress: os.Stderr})
|
err = w.PullContext(ctx, &git.PullOptions{Progress: os.Stderr})
|
||||||
if errors.Is(err, git.NoErrAlreadyUpToDate) {
|
if errors.Is(err, git.NoErrAlreadyUpToDate) {
|
||||||
log.Info("Repository up to date").Str("name", repo.Name).Send()
|
slog.Info(gotext.Get("Repository up to date"), "name", repo.Name)
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
repoFS = w.Filesystem
|
repoFS = w.Filesystem
|
||||||
|
|
||||||
// Make sure the DB is created even if the repo is up to date
|
// Make sure the DB is created even if the repo is up to date
|
||||||
if !errors.Is(err, git.NoErrAlreadyUpToDate) || db.IsEmpty(ctx) {
|
if !errors.Is(err, git.NoErrAlreadyUpToDate) || rs.db.IsEmpty(ctx) {
|
||||||
new, err := r.Head()
|
new, err := r.Head()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -105,13 +112,13 @@ func Pull(ctx context.Context, repos []types.Repo) error {
|
|||||||
// If the DB was not present at startup, that means it's
|
// If the DB was not present at startup, that means it's
|
||||||
// empty. In this case, we need to update the DB fully
|
// empty. In this case, we need to update the DB fully
|
||||||
// rather than just incrementally.
|
// rather than just incrementally.
|
||||||
if db.IsEmpty(ctx) {
|
if rs.db.IsEmpty(ctx) {
|
||||||
err = processRepoFull(ctx, repo, repoDir)
|
err = rs.processRepoFull(ctx, repo, repoDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
err = processRepoChanges(ctx, repo, r, w, old, new)
|
err = rs.processRepoChanges(ctx, repo, r, w, old, new)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -136,7 +143,7 @@ func Pull(ctx context.Context, repos []types.Repo) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
err = processRepoFull(ctx, repo, repoDir)
|
err = rs.processRepoFull(ctx, repo, repoDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -146,7 +153,7 @@ func Pull(ctx context.Context, repos []types.Repo) error {
|
|||||||
|
|
||||||
fl, err := repoFS.Open("alr-repo.toml")
|
fl, err := repoFS.Open("alr-repo.toml")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Warn("Git repository does not appear to be a valid ALR repo").Str("repo", repo.Name).Send()
|
slog.Warn(gotext.Get("Git repository does not appear to be a valid ALR repo"), "repo", repo.Name)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -162,7 +169,7 @@ func Pull(ctx context.Context, repos []types.Repo) error {
|
|||||||
// to compare it to the repo version, so only compare versions with the "v".
|
// to compare it to the repo version, so only compare versions with the "v".
|
||||||
if strings.HasPrefix(config.Version, "v") {
|
if strings.HasPrefix(config.Version, "v") {
|
||||||
if vercmp.Compare(config.Version, repoCfg.Repo.MinVersion) == -1 {
|
if vercmp.Compare(config.Version, repoCfg.Repo.MinVersion) == -1 {
|
||||||
log.Warn("ALR repo's minumum ALR version is greater than the current version. Try updating ALR if something doesn't work.").Str("repo", repo.Name).Send()
|
slog.Warn(gotext.Get("ALR repo's minimum ALR version is greater than the current version. Try updating ALR if something doesn't work."), "repo", repo.Name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -170,19 +177,7 @@ func Pull(ctx context.Context, repos []types.Repo) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
type actionType uint8
|
func (rs *Repos) processRepoChanges(ctx context.Context, repo types.Repo, r *git.Repository, w *git.Worktree, old, new *plumbing.Reference) error {
|
||||||
|
|
||||||
const (
|
|
||||||
actionDelete actionType = iota
|
|
||||||
actionUpdate
|
|
||||||
)
|
|
||||||
|
|
||||||
type action struct {
|
|
||||||
Type actionType
|
|
||||||
File string
|
|
||||||
}
|
|
||||||
|
|
||||||
func processRepoChanges(ctx context.Context, repo types.Repo, r *git.Repository, w *git.Worktree, old, new *plumbing.Reference) error {
|
|
||||||
oldCommit, err := r.CommitObject(old.Hash())
|
oldCommit, err := r.CommitObject(old.Hash())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -276,7 +271,7 @@ func processRepoChanges(ctx context.Context, repo types.Repo, r *git.Repository,
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
err = db.DeletePkgs(ctx, "name = ? AND repository = ?", pkg.Name, repo.Name)
|
err = rs.db.DeletePkgs(ctx, "name = ? AND repository = ?", pkg.Name, repo.Name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -311,7 +306,7 @@ func processRepoChanges(ctx context.Context, repo types.Repo, r *git.Repository,
|
|||||||
|
|
||||||
resolveOverrides(runner, &pkg)
|
resolveOverrides(runner, &pkg)
|
||||||
|
|
||||||
err = db.InsertPackage(ctx, pkg)
|
err = rs.db.InsertPackage(ctx, pkg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -321,23 +316,7 @@ func processRepoChanges(ctx context.Context, repo types.Repo, r *git.Repository,
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// isValid makes sure the path of the file being updated is valid.
|
func (rs *Repos) processRepoFull(ctx context.Context, repo types.Repo, repoDir string) error {
|
||||||
// It checks to make sure the file is not within a nested directory
|
|
||||||
// and that it is called alr.sh.
|
|
||||||
func isValid(from, to diff.File) bool {
|
|
||||||
var path string
|
|
||||||
if from != nil {
|
|
||||||
path = from.Path()
|
|
||||||
}
|
|
||||||
if to != nil {
|
|
||||||
path = to.Path()
|
|
||||||
}
|
|
||||||
|
|
||||||
match, _ := filepath.Match("*/*.sh", path)
|
|
||||||
return match
|
|
||||||
}
|
|
||||||
|
|
||||||
func processRepoFull(ctx context.Context, repo types.Repo, repoDir string) error {
|
|
||||||
glob := filepath.Join(repoDir, "/*/alr.sh")
|
glob := filepath.Join(repoDir, "/*/alr.sh")
|
||||||
matches, err := filepath.Glob(glob)
|
matches, err := filepath.Glob(glob)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -381,7 +360,7 @@ func processRepoFull(ctx context.Context, repo types.Repo, repoDir string) error
|
|||||||
|
|
||||||
resolveOverrides(runner, &pkg)
|
resolveOverrides(runner, &pkg)
|
||||||
|
|
||||||
err = db.InsertPackage(ctx, pkg)
|
err = rs.db.InsertPackage(ctx, pkg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -389,54 +368,3 @@ func processRepoFull(ctx context.Context, repo types.Repo, repoDir string) error
|
|||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseScript(ctx context.Context, parser *syntax.Parser, runner *interp.Runner, r io.ReadCloser, pkg *db.Package) error {
|
|
||||||
defer r.Close()
|
|
||||||
fl, err := parser.Parse(r, "alr.sh")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
runner.Reset()
|
|
||||||
err = runner.Run(ctx, fl)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
d := decoder.New(&distro.OSRelease{}, runner)
|
|
||||||
d.Overrides = false
|
|
||||||
d.LikeDistros = false
|
|
||||||
return d.DecodeVars(pkg)
|
|
||||||
}
|
|
||||||
|
|
||||||
var overridable = map[string]string{
|
|
||||||
"deps": "Depends",
|
|
||||||
"build_deps": "BuildDepends",
|
|
||||||
"desc": "Description",
|
|
||||||
"homepage": "Homepage",
|
|
||||||
"maintainer": "Maintainer",
|
|
||||||
}
|
|
||||||
|
|
||||||
func resolveOverrides(runner *interp.Runner, pkg *db.Package) {
|
|
||||||
pkgVal := reflect.ValueOf(pkg).Elem()
|
|
||||||
for name, val := range runner.Vars {
|
|
||||||
for prefix, field := range overridable {
|
|
||||||
if strings.HasPrefix(name, prefix) {
|
|
||||||
override := strings.TrimPrefix(name, prefix)
|
|
||||||
override = strings.TrimPrefix(override, "_")
|
|
||||||
|
|
||||||
field := pkgVal.FieldByName(field)
|
|
||||||
varVal := field.FieldByName("Val")
|
|
||||||
varType := varVal.Type()
|
|
||||||
|
|
||||||
switch varType.Elem().String() {
|
|
||||||
case "[]string":
|
|
||||||
varVal.SetMapIndex(reflect.ValueOf(override), reflect.ValueOf(val.List))
|
|
||||||
case "string":
|
|
||||||
varVal.SetMapIndex(reflect.ValueOf(override), reflect.ValueOf(val.Str))
|
|
||||||
}
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* alr - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package repos_test
|
package repos_test
|
||||||
|
|
||||||
@ -24,71 +25,106 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/internal/db"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
"plemya-x.ru/alr/internal/types"
|
database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
"plemya-x.ru/alr/pkg/repos"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
|
||||||
)
|
)
|
||||||
|
|
||||||
func setCfgDirs(t *testing.T) {
|
type TestEnv struct {
|
||||||
t.Helper()
|
Ctx context.Context
|
||||||
|
Cfg *TestALRConfig
|
||||||
paths := config.GetPaths()
|
Db *db.Database
|
||||||
|
|
||||||
var err error
|
|
||||||
paths.CacheDir, err = os.MkdirTemp("/tmp", "alr-pull-test.*")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
paths.RepoDir = filepath.Join(paths.CacheDir, "repo")
|
|
||||||
paths.PkgsDir = filepath.Join(paths.CacheDir, "pkgs")
|
|
||||||
|
|
||||||
err = os.MkdirAll(paths.RepoDir, 0o755)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
err = os.MkdirAll(paths.PkgsDir, 0o755)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
paths.DBPath = filepath.Join(paths.CacheDir, "db")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func removeCacheDir(t *testing.T) {
|
type TestALRConfig struct {
|
||||||
t.Helper()
|
CacheDir string
|
||||||
|
RepoDir string
|
||||||
|
PkgsDir string
|
||||||
|
}
|
||||||
|
|
||||||
err := os.RemoveAll(config.GetPaths().CacheDir)
|
func (c *TestALRConfig) GetPaths(ctx context.Context) *config.Paths {
|
||||||
if err != nil {
|
return &config.Paths{
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
DBPath: ":memory:",
|
||||||
|
CacheDir: c.CacheDir,
|
||||||
|
RepoDir: c.RepoDir,
|
||||||
|
PkgsDir: c.PkgsDir,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestPull(t *testing.T) {
|
func (c *TestALRConfig) Repos(ctx context.Context) []types.Repo {
|
||||||
_, err := db.Open(":memory:")
|
return []types.Repo{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func prepare(t *testing.T) *TestEnv {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
cacheDir, err := os.MkdirTemp("/tmp", "alr-pull-test.*")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
defer db.Close()
|
|
||||||
|
|
||||||
setCfgDirs(t)
|
repoDir := filepath.Join(cacheDir, "repo")
|
||||||
defer removeCacheDir(t)
|
err = os.MkdirAll(repoDir, 0o755)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
pkgsDir := filepath.Join(cacheDir, "pkgs")
|
||||||
|
err = os.MkdirAll(pkgsDir, 0o755)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg := &TestALRConfig{
|
||||||
|
CacheDir: cacheDir,
|
||||||
|
RepoDir: repoDir,
|
||||||
|
PkgsDir: pkgsDir,
|
||||||
|
}
|
||||||
|
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
||||||
err = repos.Pull(ctx, []types.Repo{
|
db := database.New(cfg)
|
||||||
|
db.Init(ctx)
|
||||||
|
|
||||||
|
return &TestEnv{
|
||||||
|
Cfg: cfg,
|
||||||
|
Db: db,
|
||||||
|
Ctx: ctx,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func cleanup(t *testing.T, e *TestEnv) {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
err := os.RemoveAll(e.Cfg.CacheDir)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
|
}
|
||||||
|
e.Db.Close()
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPull(t *testing.T) {
|
||||||
|
e := prepare(t)
|
||||||
|
defer cleanup(t, e)
|
||||||
|
|
||||||
|
rs := repos.New(
|
||||||
|
e.Cfg,
|
||||||
|
e.Db,
|
||||||
|
)
|
||||||
|
|
||||||
|
err := rs.Pull(e.Ctx, []types.Repo{
|
||||||
{
|
{
|
||||||
Name: "default",
|
Name: "default",
|
||||||
URL: "https://gitea.plemya-x.ru/xpamych/ALR.git",
|
URL: "https://gitea.plemya-x.ru/Plemya-x/xpamych-alr-repo.git",
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
result, err := db.GetPkgs("name LIKE 'itd%'")
|
result, err := e.Db.GetPkgs(e.Ctx, "true")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
}
|
}
|
||||||
@ -103,7 +139,7 @@ func TestPull(t *testing.T) {
|
|||||||
pkgAmt++
|
pkgAmt++
|
||||||
}
|
}
|
||||||
|
|
||||||
if pkgAmt < 2 {
|
if pkgAmt == 0 {
|
||||||
t.Errorf("Expected 2 packages to match, got %d", pkgAmt)
|
t.Errorf("Expected at least 1 matching package, but got %d", pkgAmt)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
45
pkg/repos/repos.go
Normal file
45
pkg/repos/repos.go
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package repos
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
|
database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Config interface {
|
||||||
|
GetPaths(ctx context.Context) *config.Paths
|
||||||
|
Repos(ctx context.Context) []types.Repo
|
||||||
|
}
|
||||||
|
|
||||||
|
type Repos struct {
|
||||||
|
cfg Config
|
||||||
|
db *database.Database
|
||||||
|
}
|
||||||
|
|
||||||
|
func New(
|
||||||
|
cfg Config,
|
||||||
|
db *database.Database,
|
||||||
|
) *Repos {
|
||||||
|
return &Repos{
|
||||||
|
cfg,
|
||||||
|
db,
|
||||||
|
}
|
||||||
|
}
|
70
pkg/repos/repos_legacy.go
Normal file
70
pkg/repos/repos_legacy.go
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package repos
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
|
database "gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Pull pulls the provided repositories. If a repo doesn't exist, it will be cloned
|
||||||
|
// and its packages will be written to the DB. If it does exist, it will be pulled.
|
||||||
|
// In this case, only changed packages will be processed if possible.
|
||||||
|
// If repos is set to nil, the repos in the ALR config will be used.
|
||||||
|
//
|
||||||
|
// Deprecated: use struct method
|
||||||
|
func Pull(ctx context.Context, repos []types.Repo) error {
|
||||||
|
return GetInstance(ctx).Pull(ctx, repos)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FindPkgs looks for packages matching the inputs inside the database.
|
||||||
|
// It returns a map that maps the package name input to any packages found for it.
|
||||||
|
// It also returns a slice that contains the names of all packages that were not found.
|
||||||
|
//
|
||||||
|
// Deprecated: use struct method
|
||||||
|
func FindPkgs(ctx context.Context, pkgs []string) (map[string][]db.Package, []string, error) {
|
||||||
|
return GetInstance(ctx).FindPkgs(ctx, pkgs)
|
||||||
|
}
|
||||||
|
|
||||||
|
// =======================
|
||||||
|
// FOR LEGACY ONLY
|
||||||
|
// =======================
|
||||||
|
|
||||||
|
var (
|
||||||
|
reposInstance *Repos
|
||||||
|
alrConfigOnce sync.Once
|
||||||
|
)
|
||||||
|
|
||||||
|
// Deprecated: For legacy only
|
||||||
|
func GetInstance(ctx context.Context) *Repos {
|
||||||
|
alrConfigOnce.Do(func() {
|
||||||
|
cfg := config.GetInstance(ctx)
|
||||||
|
db := database.GetInstance(ctx)
|
||||||
|
|
||||||
|
reposInstance = New(
|
||||||
|
cfg,
|
||||||
|
db,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
return reposInstance
|
||||||
|
}
|
100
pkg/repos/utils.go
Normal file
100
pkg/repos/utils.go
Normal file
@ -0,0 +1,100 @@
|
|||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package repos
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"io"
|
||||||
|
"path/filepath"
|
||||||
|
"reflect"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/go-git/go-git/v5/plumbing/format/diff"
|
||||||
|
"mvdan.cc/sh/v3/interp"
|
||||||
|
"mvdan.cc/sh/v3/syntax"
|
||||||
|
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder"
|
||||||
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
|
||||||
|
)
|
||||||
|
|
||||||
|
// isValid makes sure the path of the file being updated is valid.
|
||||||
|
// It checks to make sure the file is not within a nested directory
|
||||||
|
// and that it is called alr.sh.
|
||||||
|
func isValid(from, to diff.File) bool {
|
||||||
|
var path string
|
||||||
|
if from != nil {
|
||||||
|
path = from.Path()
|
||||||
|
}
|
||||||
|
if to != nil {
|
||||||
|
path = to.Path()
|
||||||
|
}
|
||||||
|
|
||||||
|
match, _ := filepath.Match("*/*.sh", path)
|
||||||
|
return match
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseScript(ctx context.Context, parser *syntax.Parser, runner *interp.Runner, r io.ReadCloser, pkg *db.Package) error {
|
||||||
|
defer r.Close()
|
||||||
|
fl, err := parser.Parse(r, "alr.sh")
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
runner.Reset()
|
||||||
|
err = runner.Run(ctx, fl)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
d := decoder.New(&distro.OSRelease{}, runner)
|
||||||
|
d.Overrides = false
|
||||||
|
d.LikeDistros = false
|
||||||
|
return d.DecodeVars(pkg)
|
||||||
|
}
|
||||||
|
|
||||||
|
var overridable = map[string]string{
|
||||||
|
"deps": "Depends",
|
||||||
|
"build_deps": "BuildDepends",
|
||||||
|
"desc": "Description",
|
||||||
|
"homepage": "Homepage",
|
||||||
|
"maintainer": "Maintainer",
|
||||||
|
}
|
||||||
|
|
||||||
|
func resolveOverrides(runner *interp.Runner, pkg *db.Package) {
|
||||||
|
pkgVal := reflect.ValueOf(pkg).Elem()
|
||||||
|
for name, val := range runner.Vars {
|
||||||
|
for prefix, field := range overridable {
|
||||||
|
if strings.HasPrefix(name, prefix) {
|
||||||
|
override := strings.TrimPrefix(name, prefix)
|
||||||
|
override = strings.TrimPrefix(override, "_")
|
||||||
|
|
||||||
|
field := pkgVal.FieldByName(field)
|
||||||
|
varVal := field.FieldByName("Val")
|
||||||
|
varType := varVal.Type()
|
||||||
|
|
||||||
|
switch varType.Elem().String() {
|
||||||
|
case "[]string":
|
||||||
|
varVal.SetMapIndex(reflect.ValueOf(override), reflect.ValueOf(val.List))
|
||||||
|
case "string":
|
||||||
|
varVal.SetMapIndex(reflect.ValueOf(override), reflect.ValueOf(val.Str))
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,3 +1,22 @@
|
|||||||
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
|
//
|
||||||
|
// ALR - Any Linux Repository
|
||||||
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package search
|
package search
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@ -10,8 +29,8 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/internal/db"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Filter represents search filters.
|
// Filter represents search filters.
|
||||||
|
287
repo.go
287
repo.go
@ -1,163 +1,178 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
"github.com/pelletier/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
"golang.org/x/exp/slices"
|
"golang.org/x/exp/slices"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/internal/db"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
"plemya-x.ru/alr/internal/types"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
|
||||||
"plemya-x.ru/alr/pkg/repos"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var addrepoCmd = &cli.Command{
|
func AddRepoCmd() *cli.Command {
|
||||||
Name: "addrepo",
|
return &cli.Command{
|
||||||
Usage: "Add a new repository",
|
Name: "addrepo",
|
||||||
Aliases: []string{"ar"},
|
Usage: gotext.Get("Add a new repository"),
|
||||||
Flags: []cli.Flag{
|
Aliases: []string{"ar"},
|
||||||
&cli.StringFlag{
|
Flags: []cli.Flag{
|
||||||
Name: "name",
|
&cli.StringFlag{
|
||||||
Aliases: []string{"n"},
|
Name: "name",
|
||||||
Required: true,
|
Aliases: []string{"n"},
|
||||||
Usage: "Name of the new repo",
|
Required: true,
|
||||||
|
Usage: gotext.Get("Name of the new repo"),
|
||||||
|
},
|
||||||
|
&cli.StringFlag{
|
||||||
|
Name: "url",
|
||||||
|
Aliases: []string{"u"},
|
||||||
|
Required: true,
|
||||||
|
Usage: gotext.Get("URL of the new repo"),
|
||||||
|
},
|
||||||
},
|
},
|
||||||
&cli.StringFlag{
|
Action: func(c *cli.Context) error {
|
||||||
Name: "url",
|
ctx := c.Context
|
||||||
Aliases: []string{"u"},
|
|
||||||
Required: true,
|
|
||||||
Usage: "URL of the new repo",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
ctx := c.Context
|
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
|
|
||||||
name := c.String("name")
|
name := c.String("name")
|
||||||
repoURL := c.String("url")
|
repoURL := c.String("url")
|
||||||
|
|
||||||
cfg := config.Config(ctx)
|
cfg := config.Config(ctx)
|
||||||
|
|
||||||
for _, repo := range cfg.Repos {
|
for _, repo := range cfg.Repos {
|
||||||
if repo.URL == repoURL {
|
if repo.URL == repoURL {
|
||||||
log.Fatal("Repo already exists").Str("name", repo.Name).Send()
|
slog.Error("Repo already exists", "name", repo.Name)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
cfg.Repos = append(cfg.Repos, types.Repo{
|
cfg.Repos = append(cfg.Repos, types.Repo{
|
||||||
Name: name,
|
Name: name,
|
||||||
URL: repoURL,
|
URL: repoURL,
|
||||||
})
|
})
|
||||||
|
|
||||||
cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath)
|
cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error opening config file").Err(err).Send()
|
slog.Error(gotext.Get("Error opening config file"), "err", err)
|
||||||
}
|
os.Exit(1)
|
||||||
|
|
||||||
err = toml.NewEncoder(cfgFl).Encode(cfg)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error encoding config").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
err = repos.Pull(ctx, cfg.Repos)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error pulling repos").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
var removerepoCmd = &cli.Command{
|
|
||||||
Name: "removerepo",
|
|
||||||
Usage: "Remove an existing repository",
|
|
||||||
Aliases: []string{"rr"},
|
|
||||||
Flags: []cli.Flag{
|
|
||||||
&cli.StringFlag{
|
|
||||||
Name: "name",
|
|
||||||
Aliases: []string{"n"},
|
|
||||||
Required: true,
|
|
||||||
Usage: "Name of the repo to be deleted",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Action: func(c *cli.Context) error {
|
|
||||||
ctx := c.Context
|
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
|
|
||||||
name := c.String("name")
|
|
||||||
cfg := config.Config(ctx)
|
|
||||||
|
|
||||||
found := false
|
|
||||||
index := 0
|
|
||||||
for i, repo := range cfg.Repos {
|
|
||||||
if repo.Name == name {
|
|
||||||
index = i
|
|
||||||
found = true
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if !found {
|
|
||||||
log.Fatal("Repo does not exist").Str("name", name).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
cfg.Repos = slices.Delete(cfg.Repos, index, index+1)
|
err = toml.NewEncoder(cfgFl).Encode(cfg)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error encoding config"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath)
|
err = repos.Pull(ctx, cfg.Repos)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error opening config file").Err(err).Send()
|
slog.Error(gotext.Get("Error pulling repos"), "err", err)
|
||||||
}
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
err = toml.NewEncoder(cfgFl).Encode(&cfg)
|
return nil
|
||||||
if err != nil {
|
},
|
||||||
log.Fatal("Error encoding config").Err(err).Send()
|
}
|
||||||
}
|
|
||||||
|
|
||||||
err = os.RemoveAll(filepath.Join(config.GetPaths(ctx).RepoDir, name))
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error removing repo directory").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
err = db.DeletePkgs(ctx, "repository = ?", name)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error removing packages from database").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var refreshCmd = &cli.Command{
|
func RemoveRepoCmd() *cli.Command {
|
||||||
Name: "refresh",
|
return &cli.Command{
|
||||||
Usage: "Pull all repositories that have changed",
|
Name: "removerepo",
|
||||||
Aliases: []string{"ref"},
|
Usage: gotext.Get("Remove an existing repository"),
|
||||||
Action: func(c *cli.Context) error {
|
Aliases: []string{"rr"},
|
||||||
ctx := c.Context
|
Flags: []cli.Flag{
|
||||||
log := loggerctx.From(ctx)
|
&cli.StringFlag{
|
||||||
err := repos.Pull(ctx, config.Config(ctx).Repos)
|
Name: "name",
|
||||||
if err != nil {
|
Aliases: []string{"n"},
|
||||||
log.Fatal("Error pulling repos").Err(err).Send()
|
Required: true,
|
||||||
}
|
Usage: gotext.Get("Name of the repo to be deleted"),
|
||||||
return nil
|
},
|
||||||
},
|
},
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
ctx := c.Context
|
||||||
|
|
||||||
|
name := c.String("name")
|
||||||
|
cfg := config.Config(ctx)
|
||||||
|
|
||||||
|
found := false
|
||||||
|
index := 0
|
||||||
|
for i, repo := range cfg.Repos {
|
||||||
|
if repo.Name == name {
|
||||||
|
index = i
|
||||||
|
found = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
slog.Error(gotext.Get("Repo does not exist"), "name", name)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.Repos = slices.Delete(cfg.Repos, index, index+1)
|
||||||
|
|
||||||
|
cfgFl, err := os.Create(config.GetPaths(ctx).ConfigPath)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error opening config file"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = toml.NewEncoder(cfgFl).Encode(&cfg)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error encoding config"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = os.RemoveAll(filepath.Join(config.GetPaths(ctx).RepoDir, name))
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error removing repo directory"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = db.DeletePkgs(ctx, "repository = ?", name)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error removing packages from database"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func RefreshCmd() *cli.Command {
|
||||||
|
return &cli.Command{
|
||||||
|
Name: "refresh",
|
||||||
|
Usage: gotext.Get("Pull all repositories that have changed"),
|
||||||
|
Aliases: []string{"ref"},
|
||||||
|
Action: func(c *cli.Context) error {
|
||||||
|
ctx := c.Context
|
||||||
|
err := repos.Pull(ctx, config.Config(ctx).Repos)
|
||||||
|
if err != nil {
|
||||||
|
slog.Error(gotext.Get("Error pulling repos"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,22 @@
|
|||||||
|
# This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
|
# It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
|
#
|
||||||
|
# ALR - Any Linux Repository
|
||||||
|
# Copyright (C) 2025 Евгений Храмов
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
info() {
|
info() {
|
||||||
echo $'\x1b[32m[ИНФО]\x1b[0m' $@
|
echo $'\x1b[32m[ИНФО]\x1b[0m' $@
|
||||||
}
|
}
|
||||||
|
149
upgrade.go
149
upgrade.go
@ -1,89 +1,102 @@
|
|||||||
/*
|
// This file was originally part of the project "LURE - Linux User REpository", created by Elara Musayelyan.
|
||||||
* ALR - Any Linux Repository
|
// It has been modified as part of "ALR - Any Linux Repository" by Евгений Храмов.
|
||||||
* Copyright (C) 2024 Евгений Храмов
|
//
|
||||||
*
|
// ALR - Any Linux Repository
|
||||||
* This program is free software: you can redistribute it and/or modify
|
// Copyright (C) 2025 Евгений Храмов
|
||||||
* it under the terms of the GNU General Public License as published by
|
//
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
// This program is free software: you can redistribute it and/or modify
|
||||||
* (at your option) any later version.
|
// it under the terms of the GNU General Public License as published by
|
||||||
*
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
* This program is distributed in the hope that it will be useful,
|
// (at your option) any later version.
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
//
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
// This program is distributed in the hope that it will be useful,
|
||||||
* GNU General Public License for more details.
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
*
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* You should have received a copy of the GNU General Public License
|
// GNU General Public License for more details.
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
//
|
||||||
*/
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"log/slog"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"github.com/leonelquinteros/gotext"
|
||||||
"github.com/urfave/cli/v2"
|
"github.com/urfave/cli/v2"
|
||||||
"go.elara.ws/vercmp"
|
"go.elara.ws/vercmp"
|
||||||
"golang.org/x/exp/maps"
|
"golang.org/x/exp/maps"
|
||||||
"golang.org/x/exp/slices"
|
"golang.org/x/exp/slices"
|
||||||
|
|
||||||
"plemya-x.ru/alr/internal/config"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
|
||||||
"plemya-x.ru/alr/internal/db"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
|
||||||
"plemya-x.ru/alr/internal/types"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
|
||||||
"plemya-x.ru/alr/pkg/build"
|
"gitea.plemya-x.ru/Plemya-x/ALR/internal/types"
|
||||||
"plemya-x.ru/alr/pkg/distro"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build"
|
||||||
"plemya-x.ru/alr/pkg/loggerctx"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
|
||||||
"plemya-x.ru/alr/pkg/manager"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager"
|
||||||
"plemya-x.ru/alr/pkg/repos"
|
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos"
|
||||||
)
|
)
|
||||||
|
|
||||||
var upgradeCmd = &cli.Command{
|
func UpgradeCmd() *cli.Command {
|
||||||
Name: "upgrade",
|
return &cli.Command{
|
||||||
Usage: "Upgrade all installed packages",
|
Name: "upgrade",
|
||||||
Aliases: []string{"up"},
|
Usage: gotext.Get("Upgrade all installed packages"),
|
||||||
Flags: []cli.Flag{
|
Aliases: []string{"up"},
|
||||||
&cli.BoolFlag{
|
Flags: []cli.Flag{
|
||||||
Name: "clean",
|
&cli.BoolFlag{
|
||||||
Aliases: []string{"c"},
|
Name: "clean",
|
||||||
Usage: "Build package from scratch even if there's an already built package available",
|
Aliases: []string{"c"},
|
||||||
|
Usage: gotext.Get("Build package from scratch even if there's an already built package available"),
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
Action: func(c *cli.Context) error {
|
||||||
Action: func(c *cli.Context) error {
|
ctx := c.Context
|
||||||
ctx := c.Context
|
|
||||||
log := loggerctx.From(ctx)
|
|
||||||
|
|
||||||
info, err := distro.ParseOSRelease(ctx)
|
cfg := config.GetInstance(ctx)
|
||||||
if err != nil {
|
|
||||||
log.Fatal("Error parsing os-release file").Err(err).Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
mgr := manager.Detect()
|
info, err := distro.ParseOSRelease(ctx)
|
||||||
if mgr == nil {
|
if err != nil {
|
||||||
log.Fatal("Unable to detect a supported package manager on the system").Send()
|
slog.Error(gotext.Get("Error parsing os-release file"), "err", err)
|
||||||
}
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
err = repos.Pull(ctx, config.Config(ctx).Repos)
|
mgr := manager.Detect()
|
||||||
if err != nil {
|
if mgr == nil {
|
||||||
log.Fatal("Error pulling repos").Err(err).Send()
|
slog.Error(gotext.Get("Unable to detect a supported package manager on the system"))
|
||||||
}
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
updates, err := checkForUpdates(ctx, mgr, info)
|
if cfg.AutoPull(ctx) {
|
||||||
if err != nil {
|
err = repos.Pull(ctx, config.Config(ctx).Repos)
|
||||||
log.Fatal("Error checking for updates").Err(err).Send()
|
if err != nil {
|
||||||
}
|
slog.Error(gotext.Get("Error pulling repos"), "err", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if len(updates) > 0 {
|
updates, err := checkForUpdates(ctx, mgr, info)
|
||||||
build.InstallPkgs(ctx, updates, nil, types.BuildOpts{
|
if err != nil {
|
||||||
Manager: mgr,
|
slog.Error(gotext.Get("Error checking for updates"), "err", err)
|
||||||
Clean: c.Bool("clean"),
|
os.Exit(1)
|
||||||
Interactive: c.Bool("interactive"),
|
}
|
||||||
})
|
|
||||||
} else {
|
|
||||||
log.Info("There is nothing to do.").Send()
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
if len(updates) > 0 {
|
||||||
},
|
build.InstallPkgs(ctx, updates, nil, types.BuildOpts{
|
||||||
|
Manager: mgr,
|
||||||
|
Clean: c.Bool("clean"),
|
||||||
|
Interactive: c.Bool("interactive"),
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
slog.Info(gotext.Get("There is nothing to do."))
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func checkForUpdates(ctx context.Context, mgr manager.Manager, info *distro.OSRelease) ([]db.Package, error) {
|
func checkForUpdates(ctx context.Context, mgr manager.Manager, info *distro.OSRelease) ([]db.Package, error) {
|
||||||
@ -115,10 +128,12 @@ func checkForUpdates(ctx context.Context, mgr manager.Manager, info *distro.OSRe
|
|||||||
pkg := pkgs[0]
|
pkg := pkgs[0]
|
||||||
|
|
||||||
repoVer := pkg.Version
|
repoVer := pkg.Version
|
||||||
|
releaseStr := overrides.ReleasePlatformSpecific(pkg.Release, info)
|
||||||
|
|
||||||
if pkg.Release != 0 && pkg.Epoch == 0 {
|
if pkg.Release != 0 && pkg.Epoch == 0 {
|
||||||
repoVer = fmt.Sprintf("%s-%d", pkg.Version, pkg.Release)
|
repoVer = fmt.Sprintf("%s-%s", pkg.Version, releaseStr)
|
||||||
} else if pkg.Release != 0 && pkg.Epoch != 0 {
|
} else if pkg.Release != 0 && pkg.Epoch != 0 {
|
||||||
repoVer = fmt.Sprintf("%d:%s-%d", pkg.Epoch, pkg.Version, pkg.Release)
|
repoVer = fmt.Sprintf("%d:%s-%s", pkg.Epoch, pkg.Version, releaseStr)
|
||||||
}
|
}
|
||||||
|
|
||||||
c := vercmp.Compare(repoVer, installed[pkgName])
|
c := vercmp.Compare(repoVer, installed[pkgName])
|
||||||
|
Loading…
Reference in New Issue
Block a user