Добавлены files-find: systemd, systemd-user, license

.gitignore

@@ -11,4 +11,6 @@
 
 e2e-tests/alr
 CLAUDE.md
-commit_msg.txt
+commit_msg.txt
+/scripts/.claude/settings.local.json
+/ALR

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)

internal/build/script_executor.go

@@ -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)
+		slog.Info("Package created successfully", "path", pkgPath)
-		if err != nil {
+
+		// Проверяем, что файл действительно существует
+		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,

internal/build/utils.go

@@ -49,12 +49,15 @@ import (
 
 // Функция prepareDirs подготавливает директории для сборки.
 func prepareDirs(dirs types.Directories) error {
-	// Пробуем удалить базовую директорию, если она существует
+	// Удаляем только директории источников и упаковки, не трогаем файлы пакетов в BaseDir
-	err := os.RemoveAll(dirs.BaseDir)
+	err := os.RemoveAll(dirs.SrcDir)
 	if err != nil {
-		// Если не можем удалить (например, принадлежит root), логируем и продолжаем
+		slog.Debug("Failed to remove src directory", "path", dirs.SrcDir, "error", err)
-		// Новые директории будут созданы или перезаписаны
+	}
-		slog.Debug("Failed to remove base directory", "path", dirs.BaseDir, "error", err)
+
+	err = os.RemoveAll(dirs.PkgDir)
+	if err != nil {
+		slog.Debug("Failed to remove pkg directory", "path", dirs.PkgDir, "error", err)
 	}
 
 	// Создаем базовую директорию для пакета с setgid битом

internal/shutils/helpers/files_find.go

@@ -402,3 +402,108 @@ func filesFindConfigCmd(hc interp.HandlerContext, cmd string, args []string) 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)
+}

internal/shutils/helpers/helpers.go

@@ -56,30 +56,36 @@ var Helpers = handlers.ExecFuncs{
 	"install-library":      installLibraryCmd,
 	"git-version":          gitVersionCmd,
 
-	"files-find":        filesFindCmd,
+	"files-find":             filesFindCmd,
-	"files-find-lang":   filesFindLangCmd,
+	"files-find-lang":        filesFindLangCmd,
-	"files-find-doc":    filesFindDocCmd,
+	"files-find-doc":         filesFindDocCmd,
-	"files-find-bin":    filesFindBinCmd,
+	"files-find-bin":         filesFindBinCmd,
-	"files-find-lib":    filesFindLibCmd,
+	"files-find-lib":         filesFindLibCmd,
-	"files-find-include": filesFindIncludeCmd,
+	"files-find-include":     filesFindIncludeCmd,
-	"files-find-share":  filesFindShareCmd,
+	"files-find-share":       filesFindShareCmd,
-	"files-find-man":    filesFindManCmd,
+	"files-find-man":         filesFindManCmd,
-	"files-find-config": filesFindConfigCmd,
+	"files-find-config":      filesFindConfigCmd,
+	"files-find-systemd":     filesFindSystemdCmd,
+	"files-find-systemd-user": filesFindSystemdUserCmd,
+	"files-find-license":     filesFindLicenseCmd,
 }
 
 // Restricted contains restricted read-only helper commands
 // that don't modify any state
 var Restricted = handlers.ExecFuncs{
-	"git-version":       gitVersionCmd,
+	"git-version":            gitVersionCmd,
-	"files-find":        filesFindCmd,
+	"files-find":             filesFindCmd,
-	"files-find-lang":   filesFindLangCmd,
+	"files-find-lang":        filesFindLangCmd,
-	"files-find-doc":    filesFindDocCmd,
+	"files-find-doc":         filesFindDocCmd,
-	"files-find-bin":    filesFindBinCmd,
+	"files-find-bin":         filesFindBinCmd,
-	"files-find-lib":    filesFindLibCmd,
+	"files-find-lib":         filesFindLibCmd,
-	"files-find-include": filesFindIncludeCmd,
+	"files-find-include":     filesFindIncludeCmd,
-	"files-find-share":  filesFindShareCmd,
+	"files-find-share":       filesFindShareCmd,
-	"files-find-man":    filesFindManCmd,
+	"files-find-man":         filesFindManCmd,
-	"files-find-config": filesFindConfigCmd,
+	"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 {