Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
41e3d8119f | |||
cf804ec66b | |||
6773d51caf | |||
4a616f2137 | |||
9efebbc02a |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -12,3 +12,5 @@
|
||||
e2e-tests/alr
|
||||
CLAUDE.md
|
||||
commit_msg.txt
|
||||
/scripts/.claude/settings.local.json
|
||||
/ALR
|
||||
|
7
build.go
7
build.go
@@ -197,6 +197,13 @@ func BuildCmd() *cli.Command {
|
||||
|
||||
for _, pkg := range res {
|
||||
name := filepath.Base(pkg.Path)
|
||||
|
||||
// Проверяем, существует ли файл перед перемещением
|
||||
if _, err := os.Stat(pkg.Path); os.IsNotExist(err) {
|
||||
slog.Info("Package file already moved or removed, skipping", "path", pkg.Path)
|
||||
continue
|
||||
}
|
||||
|
||||
err = osutils.Move(pkg.Path, filepath.Join(wd, name))
|
||||
if err != nil {
|
||||
return cliutils.FormatCliExit(gotext.Get("Error moving the package"), err)
|
||||
|
@@ -45,17 +45,17 @@ func TestE2EIssue130Install(t *testing.T) {
|
||||
)
|
||||
runMatrixSuite(
|
||||
t,
|
||||
"alr install {package}+alr-{repo}",
|
||||
"alr install {package}+{repo}",
|
||||
COMMON_SYSTEMS,
|
||||
func(t *testing.T, r capytest.Runner) {
|
||||
t.Parallel()
|
||||
defaultPrepare(t, r)
|
||||
|
||||
r.Command("sudo", "alr", "in", fmt.Sprintf("foo-pkg+alr-%s", REPO_NAME_FOR_E2E_TESTS)).
|
||||
r.Command("sudo", "alr", "in", fmt.Sprintf("foo-pkg+%s", REPO_NAME_FOR_E2E_TESTS)).
|
||||
ExpectSuccess().
|
||||
Run(t)
|
||||
|
||||
r.Command("sudo", "alr", "in", fmt.Sprintf("bar-pkg+alr-%s", "NOT_REPO_NAME_FOR_E2E_TESTS")).
|
||||
r.Command("sudo", "alr", "in", fmt.Sprintf("bar-pkg+%s", "NOT_REPO_NAME_FOR_E2E_TESTS")).
|
||||
ExpectFailure().
|
||||
Run(t)
|
||||
},
|
||||
|
32
fix.go
32
fix.go
@@ -131,22 +131,22 @@ func FixCmd() *cli.Command {
|
||||
}
|
||||
}
|
||||
|
||||
// Создаем базовый каталог /tmp/alr с владельцем root:wheel и правами 775
|
||||
err = utils.EnsureTempDirWithRootOwner(tmpDir, 0o775)
|
||||
// Создаем базовый каталог /tmp/alr с владельцем root:wheel и правами 2775
|
||||
err = utils.EnsureTempDirWithRootOwner(tmpDir, 0o2775)
|
||||
if err != nil {
|
||||
slog.Warn(gotext.Get("Unable to create temporary directory"), "error", err)
|
||||
}
|
||||
|
||||
// Создаем каталог dl с правами для группы wheel
|
||||
dlDir := filepath.Join(tmpDir, "dl")
|
||||
err = utils.EnsureTempDirWithRootOwner(dlDir, 0o775)
|
||||
err = utils.EnsureTempDirWithRootOwner(dlDir, 0o2775)
|
||||
if err != nil {
|
||||
slog.Warn(gotext.Get("Unable to create download directory"), "error", err)
|
||||
}
|
||||
|
||||
// Создаем каталог pkgs с правами для группы wheel
|
||||
pkgsDir := filepath.Join(tmpDir, "pkgs")
|
||||
err = utils.EnsureTempDirWithRootOwner(pkgsDir, 0o775)
|
||||
err = utils.EnsureTempDirWithRootOwner(pkgsDir, 0o2775)
|
||||
if err != nil {
|
||||
slog.Warn(gotext.Get("Unable to create packages directory"), "error", err)
|
||||
}
|
||||
@@ -158,7 +158,8 @@ func FixCmd() *cli.Command {
|
||||
// Проверяем, есть ли файлы в директории
|
||||
entries, err := os.ReadDir(tmpDir)
|
||||
if err == nil && len(entries) > 0 {
|
||||
fixCmd := execWithPrivileges("chown", "-R", "root:wheel", tmpDir)
|
||||
group := utils.GetPrivilegedGroup()
|
||||
fixCmd := execWithPrivileges("chown", "-R", "root:"+group, tmpDir)
|
||||
if fixErr := fixCmd.Run(); fixErr != nil {
|
||||
slog.Warn(gotext.Get("Unable to fix file ownership"), "error", fixErr)
|
||||
}
|
||||
@@ -172,28 +173,13 @@ func FixCmd() *cli.Command {
|
||||
|
||||
slog.Info(gotext.Get("Rebuilding cache"))
|
||||
|
||||
// Пробуем создать директорию кэша
|
||||
err = os.MkdirAll(paths.CacheDir, 0o775)
|
||||
// Создаем директорию кэша с правильными правами
|
||||
slog.Info(gotext.Get("Creating cache directory"))
|
||||
err = utils.EnsureTempDirWithRootOwner(paths.CacheDir, 0o2775)
|
||||
if err != nil {
|
||||
// Если не получилось, пробуем через sudo с правильными правами для группы wheel
|
||||
slog.Info(gotext.Get("Creating cache directory with sudo"))
|
||||
sudoCmd := execWithPrivileges("mkdir", "-p", paths.CacheDir)
|
||||
if sudoErr := sudoCmd.Run(); sudoErr != nil {
|
||||
return cliutils.FormatCliExit(gotext.Get("Unable to create new cache directory"), err)
|
||||
}
|
||||
|
||||
// Устанавливаем права 775 и группу wheel
|
||||
chmodCmd := execWithPrivileges("chmod", "775", paths.CacheDir)
|
||||
if chmodErr := chmodCmd.Run(); chmodErr != nil {
|
||||
return cliutils.FormatCliExit(gotext.Get("Unable to set cache directory permissions"), chmodErr)
|
||||
}
|
||||
|
||||
chgrpCmd := execWithPrivileges("chgrp", "wheel", paths.CacheDir)
|
||||
if chgrpErr := chgrpCmd.Run(); chgrpErr != nil {
|
||||
return cliutils.FormatCliExit(gotext.Get("Unable to set cache directory group"), chgrpErr)
|
||||
}
|
||||
}
|
||||
|
||||
deps, err = appbuilder.
|
||||
New(ctx).
|
||||
WithConfig().
|
||||
|
@@ -167,15 +167,30 @@ func (e *LocalScriptExecutor) ExecuteSecondPass(
|
||||
pkgName := packager.ConventionalFileName(pkgInfo) // Получаем имя файла пакета
|
||||
pkgPath := filepath.Join(dirs.BaseDir, pkgName) // Определяем путь к пакету
|
||||
|
||||
slog.Info("Creating package file", "path", pkgPath, "name", pkgName)
|
||||
|
||||
pkgFile, err := os.Create(pkgPath)
|
||||
if err != nil {
|
||||
slog.Error("Failed to create package file", "path", pkgPath, "error", err)
|
||||
return nil, err
|
||||
}
|
||||
defer pkgFile.Close()
|
||||
|
||||
slog.Info("Packaging with nfpm", "format", pkgFormat)
|
||||
err = packager.Package(pkgInfo, pkgFile)
|
||||
if err != nil {
|
||||
slog.Error("Failed to create package", "path", pkgPath, "error", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
err = packager.Package(pkgInfo, pkgFile)
|
||||
if err != nil {
|
||||
slog.Info("Package created successfully", "path", pkgPath)
|
||||
|
||||
// Проверяем, что файл действительно существует
|
||||
if _, err := os.Stat(pkgPath); err != nil {
|
||||
slog.Error("Package file not found after creation", "path", pkgPath, "error", err)
|
||||
return nil, err
|
||||
}
|
||||
slog.Info("Package file verified to exist", "path", pkgPath)
|
||||
|
||||
builtDeps = append(builtDeps, &BuiltDep{
|
||||
Name: vars.Name,
|
||||
|
@@ -49,12 +49,21 @@ import (
|
||||
|
||||
// Функция prepareDirs подготавливает директории для сборки.
|
||||
func prepareDirs(dirs types.Directories) error {
|
||||
// Пробуем удалить базовую директорию, если она существует
|
||||
err := os.RemoveAll(dirs.BaseDir)
|
||||
// Удаляем только директории источников и упаковки, не трогаем файлы пакетов в BaseDir
|
||||
err := os.RemoveAll(dirs.SrcDir)
|
||||
if err != nil {
|
||||
// Если не можем удалить (например, принадлежит root), логируем и продолжаем
|
||||
// Новые директории будут созданы или перезаписаны
|
||||
slog.Debug("Failed to remove base directory", "path", dirs.BaseDir, "error", err)
|
||||
slog.Debug("Failed to remove src directory", "path", dirs.SrcDir, "error", err)
|
||||
}
|
||||
|
||||
err = os.RemoveAll(dirs.PkgDir)
|
||||
if err != nil {
|
||||
slog.Debug("Failed to remove pkg directory", "path", dirs.PkgDir, "error", err)
|
||||
}
|
||||
|
||||
// Создаем базовую директорию для пакета с setgid битом
|
||||
err = utils.EnsureTempDirWithRootOwner(dirs.BaseDir, 0o2775)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Создаем директории с правильным владельцем для /tmp/alr с setgid битом
|
||||
@@ -169,7 +178,7 @@ func normalizeContents(contents []*files.Content) {
|
||||
}
|
||||
}
|
||||
|
||||
var RegexpALRPackageName = regexp.MustCompile(`^(?P<package>[^+]+)\+alr-(?P<repo>.+)$`)
|
||||
var RegexpALRPackageName = regexp.MustCompile(`^(?P<package>[^+]+)\+(?P<repo>.+)$`)
|
||||
|
||||
func getBasePkgInfo(vars *alrsh.Package, input interface {
|
||||
RepositoryProvider
|
||||
@@ -177,12 +186,8 @@ func getBasePkgInfo(vars *alrsh.Package, input interface {
|
||||
},
|
||||
) *nfpm.Info {
|
||||
repo := input.Repository()
|
||||
// Избегаем дублирования "alr-" префикса
|
||||
if strings.HasPrefix(repo, "alr-") {
|
||||
repo = repo[4:] // убираем "alr-" префикс
|
||||
}
|
||||
return &nfpm.Info{
|
||||
Name: fmt.Sprintf("%s+alr-%s", vars.Name, repo),
|
||||
Name: fmt.Sprintf("%s+%s", vars.Name, repo),
|
||||
Arch: cpu.Arch(),
|
||||
Version: vars.Version,
|
||||
Release: overrides.ReleasePlatformSpecific(vars.Release, input.OSRelease()),
|
||||
|
158
internal/build/utils_test.go
Normal file
158
internal/build/utils_test.go
Normal file
@@ -0,0 +1,158 @@
|
||||
// ALR - Any Linux Repository
|
||||
// Copyright (C) 2025 The ALR Authors
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
package build
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/alrsh"
|
||||
"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro"
|
||||
)
|
||||
|
||||
type mockInput struct {
|
||||
repo string
|
||||
osInfo *distro.OSRelease
|
||||
}
|
||||
|
||||
func (m *mockInput) Repository() string {
|
||||
return m.repo
|
||||
}
|
||||
|
||||
func (m *mockInput) OSRelease() *distro.OSRelease {
|
||||
return m.osInfo
|
||||
}
|
||||
|
||||
func TestGetBasePkgInfo(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
packageName string
|
||||
repoName string
|
||||
expectedName string
|
||||
}{
|
||||
{
|
||||
name: "обычный репозиторий",
|
||||
packageName: "test-package",
|
||||
repoName: "default",
|
||||
expectedName: "test-package+default",
|
||||
},
|
||||
{
|
||||
name: "репозиторий с alr- префиксом",
|
||||
packageName: "test-package",
|
||||
repoName: "alr-default",
|
||||
expectedName: "test-package+alr-default",
|
||||
},
|
||||
{
|
||||
name: "репозиторий с двойным alr- префиксом",
|
||||
packageName: "test-package",
|
||||
repoName: "alr-alr-repo",
|
||||
expectedName: "test-package+alr-alr-repo",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
pkg := &alrsh.Package{
|
||||
Name: tt.packageName,
|
||||
Version: "1.0.0",
|
||||
Release: 1,
|
||||
}
|
||||
|
||||
input := &mockInput{
|
||||
repo: tt.repoName,
|
||||
osInfo: &distro.OSRelease{
|
||||
ID: "test",
|
||||
},
|
||||
}
|
||||
|
||||
info := getBasePkgInfo(pkg, input)
|
||||
|
||||
if info.Name != tt.expectedName {
|
||||
t.Errorf("getBasePkgInfo() имя пакета = %v, ожидается %v", info.Name, tt.expectedName)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestRegexpALRPackageName(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
packageName string
|
||||
expectedPkg string
|
||||
expectedRepo string
|
||||
shouldMatch bool
|
||||
}{
|
||||
{
|
||||
name: "новый формат - обычный репозиторий",
|
||||
packageName: "test-package+default",
|
||||
expectedPkg: "test-package",
|
||||
expectedRepo: "default",
|
||||
shouldMatch: true,
|
||||
},
|
||||
{
|
||||
name: "новый формат - alr-default репозиторий",
|
||||
packageName: "test-package+alr-default",
|
||||
expectedPkg: "test-package",
|
||||
expectedRepo: "alr-default",
|
||||
shouldMatch: true,
|
||||
},
|
||||
{
|
||||
name: "новый формат - двойной alr- префикс",
|
||||
packageName: "test-package+alr-alr-repo",
|
||||
expectedPkg: "test-package",
|
||||
expectedRepo: "alr-alr-repo",
|
||||
shouldMatch: true,
|
||||
},
|
||||
{
|
||||
name: "некорректный формат - без плюса",
|
||||
packageName: "test-package",
|
||||
shouldMatch: false,
|
||||
},
|
||||
{
|
||||
name: "некорректный формат - пустое имя пакета",
|
||||
packageName: "+repo",
|
||||
shouldMatch: false,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
matches := RegexpALRPackageName.FindStringSubmatch(tt.packageName)
|
||||
|
||||
if tt.shouldMatch {
|
||||
if matches == nil {
|
||||
t.Errorf("RegexpALRPackageName должен найти совпадение для %q", tt.packageName)
|
||||
return
|
||||
}
|
||||
|
||||
packageName := matches[RegexpALRPackageName.SubexpIndex("package")]
|
||||
repoName := matches[RegexpALRPackageName.SubexpIndex("repo")]
|
||||
|
||||
if packageName != tt.expectedPkg {
|
||||
t.Errorf("RegexpALRPackageName извлеченное имя пакета = %v, ожидается %v", packageName, tt.expectedPkg)
|
||||
}
|
||||
|
||||
if repoName != tt.expectedRepo {
|
||||
t.Errorf("RegexpALRPackageName извлеченное имя репозитория = %v, ожидается %v", repoName, tt.expectedRepo)
|
||||
}
|
||||
} else {
|
||||
if matches != nil {
|
||||
t.Errorf("RegexpALRPackageName не должен найти совпадение для %q", tt.packageName)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
@@ -62,11 +62,9 @@ func (d *Database) Connect() error {
|
||||
dbDir := filepath.Dir(dsn)
|
||||
if _, err := os.Stat(dbDir); err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
// Директория не существует - пытаемся создать
|
||||
if mkErr := os.MkdirAll(dbDir, 0775); mkErr != nil {
|
||||
// Не смогли создать - вернём ошибку, пользователь должен использовать alr fix
|
||||
return fmt.Errorf("cache directory does not exist, please run 'alr fix' to create it: %w", mkErr)
|
||||
}
|
||||
// Директория не существует - не пытаемся создать
|
||||
// Пользователь должен использовать alr fix для создания системных каталогов
|
||||
return fmt.Errorf("cache directory does not exist, please run 'sudo alr fix' to create it")
|
||||
} else {
|
||||
return fmt.Errorf("failed to check database directory: %w", err)
|
||||
}
|
||||
|
@@ -47,9 +47,9 @@ func (rs *Repos) FindPkgs(ctx context.Context, pkgs []string) (map[string][]alrs
|
||||
name := parts[1]
|
||||
result, err = rs.db.GetPkgs(ctx, "name = ? AND repository = ?", name, repo)
|
||||
|
||||
case strings.Contains(pkgName, "+alr-"):
|
||||
// pkg+alr-repo
|
||||
parts := strings.SplitN(pkgName, "+alr-", 2)
|
||||
case strings.Contains(pkgName, "+"):
|
||||
// pkg+repo
|
||||
parts := strings.SplitN(pkgName, "+", 2)
|
||||
name := parts[0]
|
||||
repo := parts[1]
|
||||
result, err = rs.db.GetPkgs(ctx, "name = ? AND repository = ?", name, repo)
|
||||
|
@@ -177,3 +177,333 @@ func filesFindCmd(hc interp.HandlerContext, cmd string, args []string) error {
|
||||
|
||||
return outputFiles(hc, foundFiles)
|
||||
}
|
||||
|
||||
func filesFindBinCmd(hc interp.HandlerContext, cmd string, args []string) error {
|
||||
namePattern := "*"
|
||||
if len(args) > 0 {
|
||||
namePattern = args[0]
|
||||
}
|
||||
|
||||
binPath := "./usr/bin/"
|
||||
realPath := path.Join(hc.Dir, binPath)
|
||||
|
||||
if err := validateDir(realPath, "files-find-bin"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var binFiles []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 := makeRelativePath(hc.Dir, p)
|
||||
if relErr != nil {
|
||||
return relErr
|
||||
}
|
||||
binFiles = append(binFiles, relPath)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("files-find-bin: %w", err)
|
||||
}
|
||||
|
||||
return outputFiles(hc, binFiles)
|
||||
}
|
||||
|
||||
func filesFindLibCmd(hc interp.HandlerContext, cmd string, args []string) error {
|
||||
namePattern := "*"
|
||||
if len(args) > 0 {
|
||||
namePattern = args[0]
|
||||
}
|
||||
|
||||
libPaths := []string{"./usr/lib/", "./usr/lib64/"}
|
||||
var libFiles []string
|
||||
|
||||
for _, libPath := range libPaths {
|
||||
realPath := path.Join(hc.Dir, libPath)
|
||||
if _, err := os.Stat(realPath); os.IsNotExist(err) {
|
||||
continue
|
||||
}
|
||||
|
||||
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 := makeRelativePath(hc.Dir, p)
|
||||
if relErr != nil {
|
||||
return relErr
|
||||
}
|
||||
libFiles = append(libFiles, relPath)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("files-find-lib: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
return outputFiles(hc, libFiles)
|
||||
}
|
||||
|
||||
func filesFindIncludeCmd(hc interp.HandlerContext, cmd string, args []string) error {
|
||||
namePattern := "*"
|
||||
if len(args) > 0 {
|
||||
namePattern = args[0]
|
||||
}
|
||||
|
||||
includePath := "./usr/include/"
|
||||
realPath := path.Join(hc.Dir, includePath)
|
||||
|
||||
if err := validateDir(realPath, "files-find-include"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var includeFiles []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 := makeRelativePath(hc.Dir, p)
|
||||
if relErr != nil {
|
||||
return relErr
|
||||
}
|
||||
includeFiles = append(includeFiles, relPath)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("files-find-include: %w", err)
|
||||
}
|
||||
|
||||
return outputFiles(hc, includeFiles)
|
||||
}
|
||||
|
||||
func filesFindShareCmd(hc interp.HandlerContext, cmd string, args []string) error {
|
||||
namePattern := "*"
|
||||
sharePath := "./usr/share/"
|
||||
|
||||
if len(args) > 0 {
|
||||
if len(args) == 1 {
|
||||
sharePath = "./usr/share/" + args[0] + "/"
|
||||
} else {
|
||||
sharePath = "./usr/share/" + args[0] + "/"
|
||||
namePattern = args[1]
|
||||
}
|
||||
}
|
||||
|
||||
realPath := path.Join(hc.Dir, sharePath)
|
||||
|
||||
if err := validateDir(realPath, "files-find-share"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var shareFiles []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 := makeRelativePath(hc.Dir, p)
|
||||
if relErr != nil {
|
||||
return relErr
|
||||
}
|
||||
shareFiles = append(shareFiles, relPath)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("files-find-share: %w", err)
|
||||
}
|
||||
|
||||
return outputFiles(hc, shareFiles)
|
||||
}
|
||||
|
||||
func filesFindManCmd(hc interp.HandlerContext, cmd string, args []string) error {
|
||||
namePattern := "*"
|
||||
manSection := "*"
|
||||
|
||||
if len(args) > 0 {
|
||||
if len(args) == 1 {
|
||||
manSection = args[0]
|
||||
} else {
|
||||
manSection = args[0]
|
||||
namePattern = args[1]
|
||||
}
|
||||
}
|
||||
|
||||
manPath := "./usr/share/man/man" + manSection + "/"
|
||||
realPath := path.Join(hc.Dir, manPath)
|
||||
|
||||
if err := validateDir(realPath, "files-find-man"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var manFiles []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 := makeRelativePath(hc.Dir, p)
|
||||
if relErr != nil {
|
||||
return relErr
|
||||
}
|
||||
manFiles = append(manFiles, relPath)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("files-find-man: %w", err)
|
||||
}
|
||||
|
||||
return outputFiles(hc, manFiles)
|
||||
}
|
||||
|
||||
func filesFindConfigCmd(hc interp.HandlerContext, cmd string, args []string) error {
|
||||
namePattern := "*"
|
||||
if len(args) > 0 {
|
||||
namePattern = args[0]
|
||||
}
|
||||
|
||||
configPath := "./etc/"
|
||||
realPath := path.Join(hc.Dir, configPath)
|
||||
|
||||
if err := validateDir(realPath, "files-find-config"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var configFiles []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 := makeRelativePath(hc.Dir, p)
|
||||
if relErr != nil {
|
||||
return relErr
|
||||
}
|
||||
configFiles = append(configFiles, relPath)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("files-find-config: %w", err)
|
||||
}
|
||||
|
||||
return outputFiles(hc, configFiles)
|
||||
}
|
||||
|
||||
func filesFindSystemdCmd(hc interp.HandlerContext, cmd string, args []string) error {
|
||||
namePattern := "*"
|
||||
if len(args) > 0 {
|
||||
namePattern = args[0]
|
||||
}
|
||||
|
||||
systemdPath := "./usr/lib/systemd/system/"
|
||||
realPath := path.Join(hc.Dir, systemdPath)
|
||||
|
||||
if err := validateDir(realPath, "files-find-systemd"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var systemdFiles []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 := makeRelativePath(hc.Dir, p)
|
||||
if relErr != nil {
|
||||
return relErr
|
||||
}
|
||||
systemdFiles = append(systemdFiles, relPath)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("files-find-systemd: %w", err)
|
||||
}
|
||||
|
||||
return outputFiles(hc, systemdFiles)
|
||||
}
|
||||
|
||||
func filesFindSystemdUserCmd(hc interp.HandlerContext, cmd string, args []string) error {
|
||||
namePattern := "*"
|
||||
if len(args) > 0 {
|
||||
namePattern = args[0]
|
||||
}
|
||||
|
||||
systemdUserPath := "./usr/lib/systemd/user/"
|
||||
realPath := path.Join(hc.Dir, systemdUserPath)
|
||||
|
||||
if err := validateDir(realPath, "files-find-systemd-user"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var systemdUserFiles []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 := makeRelativePath(hc.Dir, p)
|
||||
if relErr != nil {
|
||||
return relErr
|
||||
}
|
||||
systemdUserFiles = append(systemdUserFiles, relPath)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("files-find-systemd-user: %w", err)
|
||||
}
|
||||
|
||||
return outputFiles(hc, systemdUserFiles)
|
||||
}
|
||||
|
||||
func filesFindLicenseCmd(hc interp.HandlerContext, cmd string, args []string) error {
|
||||
namePattern := "*"
|
||||
if len(args) > 0 {
|
||||
namePattern = args[0]
|
||||
}
|
||||
|
||||
licensePath := "./usr/share/licenses/"
|
||||
realPath := path.Join(hc.Dir, licensePath)
|
||||
|
||||
if err := validateDir(realPath, "files-find-license"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var licenseFiles []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 := makeRelativePath(hc.Dir, p)
|
||||
if relErr != nil {
|
||||
return relErr
|
||||
}
|
||||
licenseFiles = append(licenseFiles, relPath)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return fmt.Errorf("files-find-license: %w", err)
|
||||
}
|
||||
|
||||
return outputFiles(hc, licenseFiles)
|
||||
}
|
||||
|
@@ -59,6 +59,15 @@ var Helpers = handlers.ExecFuncs{
|
||||
"files-find": filesFindCmd,
|
||||
"files-find-lang": filesFindLangCmd,
|
||||
"files-find-doc": filesFindDocCmd,
|
||||
"files-find-bin": filesFindBinCmd,
|
||||
"files-find-lib": filesFindLibCmd,
|
||||
"files-find-include": filesFindIncludeCmd,
|
||||
"files-find-share": filesFindShareCmd,
|
||||
"files-find-man": filesFindManCmd,
|
||||
"files-find-config": filesFindConfigCmd,
|
||||
"files-find-systemd": filesFindSystemdCmd,
|
||||
"files-find-systemd-user": filesFindSystemdUserCmd,
|
||||
"files-find-license": filesFindLicenseCmd,
|
||||
}
|
||||
|
||||
// Restricted contains restricted read-only helper commands
|
||||
@@ -68,6 +77,15 @@ var Restricted = handlers.ExecFuncs{
|
||||
"files-find": filesFindCmd,
|
||||
"files-find-lang": filesFindLangCmd,
|
||||
"files-find-doc": filesFindDocCmd,
|
||||
"files-find-bin": filesFindBinCmd,
|
||||
"files-find-lib": filesFindLibCmd,
|
||||
"files-find-include": filesFindIncludeCmd,
|
||||
"files-find-share": filesFindShareCmd,
|
||||
"files-find-man": filesFindManCmd,
|
||||
"files-find-config": filesFindConfigCmd,
|
||||
"files-find-systemd": filesFindSystemdCmd,
|
||||
"files-find-systemd-user": filesFindSystemdUserCmd,
|
||||
"files-find-license": filesFindLicenseCmd,
|
||||
}
|
||||
|
||||
func installHelperCmd(prefix string, perms os.FileMode) handlers.ExecFunc {
|
||||
|
@@ -21,6 +21,7 @@ import (
|
||||
"github.com/urfave/cli/v2"
|
||||
|
||||
appbuilder "gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils/app_builder"
|
||||
"gitea.plemya-x.ru/Plemya-x/ALR/internal/utils"
|
||||
)
|
||||
|
||||
func RefreshCmd() *cli.Command {
|
||||
@@ -29,6 +30,9 @@ func RefreshCmd() *cli.Command {
|
||||
Usage: gotext.Get("Pull all repositories that have changed"),
|
||||
Aliases: []string{"ref"},
|
||||
Action: func(c *cli.Context) error {
|
||||
if err := utils.CheckUserPrivileges(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
ctx := c.Context
|
||||
|
||||
|
Reference in New Issue
Block a user