feat: add autoPull in config #17
							
								
								
									
										6
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								Makefile
									
									
									
									
									
								
							| @@ -13,6 +13,7 @@ INSTALLED_ZSH_COMPLETION := $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_$(NAME | |||||||
|  |  | ||||||
| ADD_LICENSE_BIN := go run github.com/google/addlicense@4caba19b7ed7818bb86bc4cd20411a246aa4a524 | 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 | 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 | ||||||
|  |  | ||||||
| @@ -60,3 +61,8 @@ update-license: | |||||||
|  |  | ||||||
| fmt: | fmt: | ||||||
| 	$(GOLANGCI_LINT_BIN) run --fix | 	$(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 | ||||||
							
								
								
									
										33
									
								
								build.go
									
									
									
									
									
								
							
							
						
						
									
										33
									
								
								build.go
									
									
									
									
									
								
							| @@ -20,58 +20,63 @@ | |||||||
| 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" | ||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/osutils" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/osutils" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| var buildCmd = &cli.Command{ | func BuildCmd() *cli.Command { | ||||||
|  | 	return &cli.Command{ | ||||||
| 		Name:  "build", | 		Name:  "build", | ||||||
| 	Usage: "Build a local package", | 		Usage: gotext.Get("Build a local package"), | ||||||
| 		Flags: []cli.Flag{ | 		Flags: []cli.Flag{ | ||||||
| 			&cli.StringFlag{ | 			&cli.StringFlag{ | ||||||
| 				Name:    "script", | 				Name:    "script", | ||||||
| 				Aliases: []string{"s"}, | 				Aliases: []string{"s"}, | ||||||
| 				Value:   "alr.sh", | 				Value:   "alr.sh", | ||||||
| 			Usage:   "Path to the build script", | 				Usage:   gotext.Get("Path to the build script"), | ||||||
| 			}, | 			}, | ||||||
| 			&cli.StringFlag{ | 			&cli.StringFlag{ | ||||||
| 				Name:    "package", | 				Name:    "package", | ||||||
| 				Aliases: []string{"p"}, | 				Aliases: []string{"p"}, | ||||||
| 			Usage:   "Name of the package to build and its repo (example: default/go-bin)", | 				Usage:   gotext.Get("Name of the package to build and its repo (example: default/go-bin)"), | ||||||
| 			}, | 			}, | ||||||
| 			&cli.BoolFlag{ | 			&cli.BoolFlag{ | ||||||
| 				Name:    "clean", | 				Name:    "clean", | ||||||
| 				Aliases: []string{"c"}, | 				Aliases: []string{"c"}, | ||||||
| 			Usage:   "Build package from scratch even if there's an already built package available", | 				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) |  | ||||||
|  |  | ||||||
| 			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") | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
|  | 			if config.GetInstance(ctx).AutoPull(ctx) { | ||||||
| 				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 repositories").Err(err).Send() | 					slog.Error(gotext.Get("Error pulling repositories"), "err", err) | ||||||
|  | 					os.Exit(1) | ||||||
|  | 				} | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			mgr := manager.Detect() | 			mgr := manager.Detect() | ||||||
| 			if mgr == nil { | 			if mgr == nil { | ||||||
| 			log.Fatal("Unable to detect a supported package manager on the system").Send() | 				slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			pkgPaths, _, err := build.BuildPackage(ctx, types.BuildOpts{ | 			pkgPaths, _, err := build.BuildPackage(ctx, types.BuildOpts{ | ||||||
| @@ -81,22 +86,26 @@ var buildCmd = &cli.Command{ | |||||||
| 				Interactive: c.Bool("interactive"), | 				Interactive: c.Bool("interactive"), | ||||||
| 			}) | 			}) | ||||||
| 			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) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			wd, err := os.Getwd() | 			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) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			for _, pkgPath := range pkgPaths { | 			for _, pkgPath := range pkgPaths { | ||||||
| 				name := filepath.Base(pkgPath) | 				name := filepath.Base(pkgPath) | ||||||
| 				err = osutils.Move(pkgPath, filepath.Join(wd, name)) | 				err = osutils.Move(pkgPath, filepath.Join(wd, name)) | ||||||
| 				if err != nil { | 				if err != nil { | ||||||
| 				log.Fatal("Error moving the package").Err(err).Send() | 					slog.Error(gotext.Get("Error moving the package"), "err", err) | ||||||
|  | 					os.Exit(1) | ||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			return nil | 			return nil | ||||||
| 		}, | 		}, | ||||||
|  | 	} | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										25
									
								
								fix.go
									
									
									
									
									
								
							
							
						
						
									
										25
									
								
								fix.go
									
									
									
									
									
								
							| @@ -20,47 +20,52 @@ | |||||||
| package main | package main | ||||||
|  |  | ||||||
| import ( | import ( | ||||||
|  | 	"log/slog" | ||||||
| 	"os" | 	"os" | ||||||
|  |  | ||||||
|  | 	"github.com/leonelquinteros/gotext" | ||||||
| 	"github.com/urfave/cli/v2" | 	"github.com/urfave/cli/v2" | ||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| var fixCmd = &cli.Command{ | func FixCmd() *cli.Command { | ||||||
|  | 	return &cli.Command{ | ||||||
| 		Name:  "fix", | 		Name:  "fix", | ||||||
| 	Usage: "Attempt to fix problems with ALR", | 		Usage: gotext.Get("Attempt to fix problems with ALR"), | ||||||
| 		Action: func(c *cli.Context) error { | 		Action: func(c *cli.Context) error { | ||||||
| 			ctx := c.Context | 			ctx := c.Context | ||||||
| 		log := loggerctx.From(ctx) |  | ||||||
|  |  | ||||||
| 			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 | ||||||
| 		}, | 		}, | ||||||
|  | 	} | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										17
									
								
								gen.go
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								gen.go
									
									
									
									
									
								
							| @@ -22,23 +22,21 @@ package main | |||||||
| import ( | import ( | ||||||
| 	"os" | 	"os" | ||||||
|  |  | ||||||
|  | 	"github.com/leonelquinteros/gotext" | ||||||
| 	"github.com/urfave/cli/v2" | 	"github.com/urfave/cli/v2" | ||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/gen" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/gen" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| var genCmd = &cli.Command{ | func GenCmd() *cli.Command { | ||||||
|  | 	return &cli.Command{ | ||||||
| 		Name:    "generate", | 		Name:    "generate", | ||||||
| 	Usage:   "Generate a ALR script from a template", | 		Usage:   gotext.Get("Generate a ALR script from a template"), | ||||||
| 		Aliases: []string{"gen"}, | 		Aliases: []string{"gen"}, | ||||||
| 		Subcommands: []*cli.Command{ | 		Subcommands: []*cli.Command{ | ||||||
| 		genPipCmd, | 			{ | ||||||
| 	}, |  | ||||||
| } |  | ||||||
|  |  | ||||||
| var genPipCmd = &cli.Command{ |  | ||||||
| 				Name:  "pip", | 				Name:  "pip", | ||||||
| 	Usage: "Generate a ALR script for a pip module", | 				Usage: gotext.Get("Generate a ALR script for a pip module"), | ||||||
| 				Flags: []cli.Flag{ | 				Flags: []cli.Flag{ | ||||||
| 					&cli.StringFlag{ | 					&cli.StringFlag{ | ||||||
| 						Name:     "name", | 						Name:     "name", | ||||||
| @@ -62,4 +60,7 @@ var genPipCmd = &cli.Command{ | |||||||
| 						Description: c.String("description"), | 						Description: c.String("description"), | ||||||
| 					}) | 					}) | ||||||
| 				}, | 				}, | ||||||
|  | 			}, | ||||||
|  | 		}, | ||||||
|  | 	} | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										26
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								go.mod
									
									
									
									
									
								
							| @@ -10,11 +10,14 @@ 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 | ||||||
| @@ -27,10 +30,10 @@ require ( | |||||||
| 	go.elara.ws/logger v0.0.0-20230421022458-e80700db2090 | 	go.elara.ws/logger v0.0.0-20230421022458-e80700db2090 | ||||||
| 	go.elara.ws/translate v0.0.0-20230421025926-32ccfcd110e6 | 	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.7.0 | ||||||
| @@ -63,6 +66,7 @@ require ( | |||||||
| 	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 | ||||||
| @@ -81,7 +85,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 | ||||||
| @@ -96,7 +100,7 @@ require ( | |||||||
| 	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/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 | ||||||
| @@ -110,11 +114,11 @@ require ( | |||||||
| 	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.17.0 // indirect | ||||||
| 	golang.org/x/net v0.23.0 // indirect | 	golang.org/x/net v0.25.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.24.0 // indirect | ||||||
| 	golang.org/x/tools v0.16.0 // indirect | 	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // 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 | ||||||
|   | |||||||
							
								
								
									
										52
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										52
									
								
								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= | ||||||
| @@ -127,6 +129,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= | ||||||
| @@ -199,6 +203,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 +230,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 +297,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= | ||||||
| @@ -370,8 +380,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 +411,8 @@ 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/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 +433,8 @@ 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/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 +448,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= | ||||||
| @@ -469,15 +479,15 @@ 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/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 +498,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 +528,8 @@ 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/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= | ||||||
|   | |||||||
							
								
								
									
										43
									
								
								helper.go
									
									
									
									
									
								
							
							
						
						
									
										43
									
								
								helper.go
									
									
									
									
									
								
							| @@ -21,9 +21,11 @@ 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" | ||||||
| @@ -31,25 +33,36 @@ import ( | |||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/helpers" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/helpers" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| ) | ) | ||||||
|  |  | ||||||
| var helperCmd = &cli.Command{ | func HelperCmd() *cli.Command { | ||||||
|  | 	helperListCmd := &cli.Command{ | ||||||
|  | 		Name:    "list", | ||||||
|  | 		Usage:   gotext.Get("List all the available helper commands"), | ||||||
|  | 		Aliases: []string{"ls"}, | ||||||
|  | 		Action: func(ctx *cli.Context) error { | ||||||
|  | 			for name := range helpers.Helpers { | ||||||
|  | 				fmt.Println(name) | ||||||
|  | 			} | ||||||
|  | 			return nil | ||||||
|  | 		}, | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	return &cli.Command{ | ||||||
| 		Name:        "helper", | 		Name:        "helper", | ||||||
| 	Usage:       "Run a ALR helper command", | 		Usage:       gotext.Get("Run a ALR helper command"), | ||||||
| 		ArgsUsage:   `<helper_name|"list">`, | 		ArgsUsage:   `<helper_name|"list">`, | ||||||
| 		Subcommands: []*cli.Command{helperListCmd}, | 		Subcommands: []*cli.Command{helperListCmd}, | ||||||
| 		Flags: []cli.Flag{ | 		Flags: []cli.Flag{ | ||||||
| 			&cli.StringFlag{ | 			&cli.StringFlag{ | ||||||
| 				Name:    "dest-dir", | 				Name:    "dest-dir", | ||||||
| 				Aliases: []string{"d"}, | 				Aliases: []string{"d"}, | ||||||
| 			Usage:   "The directory that the install commands will install to", | 				Usage:   gotext.Get("The directory that the install commands will install to"), | ||||||
| 				Value:   "dest", | 				Value:   "dest", | ||||||
| 			}, | 			}, | ||||||
| 		}, | 		}, | ||||||
| 		Action: func(c *cli.Context) error { | 		Action: func(c *cli.Context) error { | ||||||
| 			ctx := c.Context | 			ctx := c.Context | ||||||
| 		log := loggerctx.From(ctx) |  | ||||||
|  |  | ||||||
| 			if c.Args().Len() < 1 { | 			if c.Args().Len() < 1 { | ||||||
| 				cli.ShowSubcommandHelpAndExit(c, 1) | 				cli.ShowSubcommandHelpAndExit(c, 1) | ||||||
| @@ -57,17 +70,20 @@ var helperCmd = &cli.Command{ | |||||||
|  |  | ||||||
| 			helper, ok := helpers.Helpers[c.Args().First()] | 			helper, ok := helpers.Helpers[c.Args().First()] | ||||||
| 			if !ok { | 			if !ok { | ||||||
| 			log.Fatal("No such helper command").Str("name", c.Args().First()).Send() | 				slog.Error(gotext.Get("No such helper command"), "name", c.Args().First()) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			wd, err := os.Getwd() | 			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) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			info, err := distro.ParseOSRelease(ctx) | 			info, err := distro.ParseOSRelease(ctx) | ||||||
| 			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{ | 			hc := interp.HandlerContext{ | ||||||
| @@ -91,16 +107,5 @@ var helperCmd = &cli.Command{ | |||||||
| 				fmt.Println(name) | 				fmt.Println(name) | ||||||
| 			} | 			} | ||||||
| 		}, | 		}, | ||||||
| } |  | ||||||
|  |  | ||||||
| var helperListCmd = &cli.Command{ |  | ||||||
| 	Name:    "list", |  | ||||||
| 	Usage:   "List all the available helper commands", |  | ||||||
| 	Aliases: []string{"ls"}, |  | ||||||
| 	Action: func(ctx *cli.Context) error { |  | ||||||
| 		for name := range helpers.Helpers { |  | ||||||
| 			fmt.Println(name) |  | ||||||
| 	} | 	} | ||||||
| 		return nil |  | ||||||
| 	}, |  | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										49
									
								
								info.go
									
									
									
									
									
								
							
							
						
						
									
										49
									
								
								info.go
									
									
									
									
									
								
							| @@ -21,46 +21,62 @@ 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" | ||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | ||||||
|  | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| var infoCmd = &cli.Command{ | func InfoCmd() *cli.Command { | ||||||
|  | 	return &cli.Command{ | ||||||
| 		Name:  "info", | 		Name:  "info", | ||||||
| 	Usage: "Print information about a package", | 		Usage: gotext.Get("Print information about a package"), | ||||||
| 		Flags: []cli.Flag{ | 		Flags: []cli.Flag{ | ||||||
| 			&cli.BoolFlag{ | 			&cli.BoolFlag{ | ||||||
| 				Name:    "all", | 				Name:    "all", | ||||||
| 				Aliases: []string{"a"}, | 				Aliases: []string{"a"}, | ||||||
| 			Usage:   "Show all information, not just for the current distro", | 				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) |  | ||||||
|  | 			cfg := config.New() | ||||||
|  | 			db := db.New(cfg) | ||||||
|  | 			err := db.Init(ctx) | ||||||
|  | 			if err != nil { | ||||||
|  | 				slog.Error(gotext.Get("Error initialization database"), "err", err) | ||||||
|  | 				os.Exit(1) | ||||||
|  | 			} | ||||||
|  | 			rs := repos.New(cfg, db) | ||||||
|  |  | ||||||
| 			args := c.Args() | 			args := c.Args() | ||||||
| 			if args.Len() < 1 { | 			if args.Len() < 1 { | ||||||
| 			log.Fatalf("Command info expected at least 1 argument, got %d", args.Len()).Send() | 				slog.Error(gotext.Get("Command info expected at least 1 argument, got %d", args.Len())) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 		err := repos.Pull(ctx, config.Config(ctx).Repos) | 			if cfg.AutoPull(ctx) { | ||||||
|  | 				err := rs.Pull(ctx, cfg.Repos(ctx)) | ||||||
| 				if err != nil { | 				if err != nil { | ||||||
| 			log.Fatal("Error pulling repositories").Err(err).Send() | 					slog.Error(gotext.Get("Error pulling repos"), "err", err) | ||||||
|  | 					os.Exit(1) | ||||||
|  | 				} | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 		found, _, err := repos.FindPkgs(ctx, args.Slice()) | 			found, _, err := rs.FindPkgs(ctx, args.Slice()) | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 			log.Fatal("Error finding packages").Err(err).Send() | 				slog.Error(gotext.Get("Error finding packages"), "err", err) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			if len(found) == 0 { | 			if len(found) == 0 { | ||||||
| @@ -75,7 +91,8 @@ var infoCmd = &cli.Command{ | |||||||
| 			if !all { | 			if !all { | ||||||
| 				info, err := distro.ParseOSRelease(ctx) | 				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 parsing os-release file"), "err", err) | ||||||
|  | 					os.Exit(1) | ||||||
| 				} | 				} | ||||||
| 				names, err = overrides.Resolve( | 				names, err = overrides.Resolve( | ||||||
| 					info, | 					info, | ||||||
| @@ -83,7 +100,8 @@ var infoCmd = &cli.Command{ | |||||||
| 						WithLanguages([]string{config.SystemLang()}), | 						WithLanguages([]string{config.SystemLang()}), | ||||||
| 				) | 				) | ||||||
| 				if err != nil { | 				if err != nil { | ||||||
| 				log.Fatal("Error resolving overrides").Err(err).Send() | 					slog.Error(gotext.Get("Error resolving overrides"), "err", err) | ||||||
|  | 					os.Exit(1) | ||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| @@ -91,12 +109,14 @@ var infoCmd = &cli.Command{ | |||||||
| 				if !all { | 				if !all { | ||||||
| 					err = yaml.NewEncoder(os.Stdout).Encode(overrides.ResolvePackage(&pkg, names)) | 					err = yaml.NewEncoder(os.Stdout).Encode(overrides.ResolvePackage(&pkg, names)) | ||||||
| 					if err != nil { | 					if err != nil { | ||||||
| 					log.Fatal("Error encoding script variables").Err(err).Send() | 						slog.Error(gotext.Get("Error encoding script variables"), "err", err) | ||||||
|  | 						os.Exit(1) | ||||||
| 					} | 					} | ||||||
| 				} else { | 				} else { | ||||||
| 					err = yaml.NewEncoder(os.Stdout).Encode(pkg) | 					err = yaml.NewEncoder(os.Stdout).Encode(pkg) | ||||||
| 					if err != nil { | 					if err != nil { | ||||||
| 					log.Fatal("Error encoding script variables").Err(err).Send() | 						slog.Error(gotext.Get("Error encoding script variables"), "err", err) | ||||||
|  | 						os.Exit(1) | ||||||
| 					} | 					} | ||||||
| 				} | 				} | ||||||
|  |  | ||||||
| @@ -105,4 +125,5 @@ var infoCmd = &cli.Command{ | |||||||
|  |  | ||||||
| 			return nil | 			return nil | ||||||
| 		}, | 		}, | ||||||
|  | 	} | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										49
									
								
								install.go
									
									
									
									
									
								
							
							
						
						
									
										49
									
								
								install.go
									
									
									
									
									
								
							| @@ -21,7 +21,10 @@ package main | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
|  | 	"log/slog" | ||||||
|  | 	"os" | ||||||
|  |  | ||||||
|  | 	"github.com/leonelquinteros/gotext" | ||||||
| 	"github.com/urfave/cli/v2" | 	"github.com/urfave/cli/v2" | ||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cliutils" | ||||||
| @@ -29,14 +32,14 @@ import ( | |||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| var installCmd = &cli.Command{ | func InstallCmd() *cli.Command { | ||||||
|  | 	return &cli.Command{ | ||||||
| 		Name:    "install", | 		Name:    "install", | ||||||
| 	Usage:   "Install a new package", | 		Usage:   gotext.Get("Install a new package"), | ||||||
| 		Aliases: []string{"in"}, | 		Aliases: []string{"in"}, | ||||||
| 		Flags: []cli.Flag{ | 		Flags: []cli.Flag{ | ||||||
| 			&cli.BoolFlag{ | 			&cli.BoolFlag{ | ||||||
| @@ -47,26 +50,31 @@ var installCmd = &cli.Command{ | |||||||
| 		}, | 		}, | ||||||
| 		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() | 			mgr := manager.Detect() | ||||||
| 			if mgr == nil { | 			if mgr == nil { | ||||||
| 			log.Fatal("Unable to detect a supported package manager on the system").Send() | 				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) | 				err := repos.Pull(ctx, config.Config(ctx).Repos) | ||||||
| 				if err != nil { | 				if err != nil { | ||||||
| 			log.Fatal("Error pulling repositories").Err(err).Send() | 					slog.Error(gotext.Get("Error pulling repositories"), "err", err) | ||||||
|  | 					os.Exit(1) | ||||||
|  | 				} | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			found, notFound, err := repos.FindPkgs(ctx, args.Slice()) | 			found, notFound, err := repos.FindPkgs(ctx, args.Slice()) | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 			log.Fatal("Error finding packages").Err(err).Send() | 				slog.Error(gotext.Get("Error finding packages"), "err", err) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			pkgs := cliutils.FlattenPkgs(ctx, found, "install", c.Bool("interactive")) | 			pkgs := cliutils.FlattenPkgs(ctx, found, "install", c.Bool("interactive")) | ||||||
| @@ -78,10 +86,10 @@ var installCmd = &cli.Command{ | |||||||
| 			return nil | 			return nil | ||||||
| 		}, | 		}, | ||||||
| 		BashComplete: func(c *cli.Context) { | 		BashComplete: func(c *cli.Context) { | ||||||
| 		log := loggerctx.From(c.Context) |  | ||||||
| 			result, err := db.GetPkgs(c.Context, "true") | 			result, err := db.GetPkgs(c.Context, "true") | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 			log.Fatal("Error getting packages").Err(err).Send() | 				slog.Error(gotext.Get("Error getting packages"), "err", err) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
| 			defer result.Close() | 			defer result.Close() | ||||||
|  |  | ||||||
| @@ -89,36 +97,41 @@ var installCmd = &cli.Command{ | |||||||
| 				var pkg db.Package | 				var pkg db.Package | ||||||
| 				err = result.StructScan(&pkg) | 				err = result.StructScan(&pkg) | ||||||
| 				if err != nil { | 				if err != nil { | ||||||
| 				log.Fatal("Error iterating over packages").Err(err).Send() | 					slog.Error(gotext.Get("Error iterating over packages"), "err", err) | ||||||
|  | 					os.Exit(1) | ||||||
| 				} | 				} | ||||||
|  |  | ||||||
| 				fmt.Println(pkg.Name) | 				fmt.Println(pkg.Name) | ||||||
| 			} | 			} | ||||||
| 		}, | 		}, | ||||||
|  | 	} | ||||||
| } | } | ||||||
|  |  | ||||||
| var removeCmd = &cli.Command{ | func RemoveCmd() *cli.Command { | ||||||
|  | 	return &cli.Command{ | ||||||
| 		Name:    "remove", | 		Name:    "remove", | ||||||
| 	Usage:   "Remove an installed package", | 		Usage:   gotext.Get("Remove an installed package"), | ||||||
| 		Aliases: []string{"rm"}, | 		Aliases: []string{"rm"}, | ||||||
| 		Action: func(c *cli.Context) error { | 		Action: func(c *cli.Context) error { | ||||||
| 		log := loggerctx.From(c.Context) |  | ||||||
|  |  | ||||||
| 			args := c.Args() | 			args := c.Args() | ||||||
| 			if args.Len() < 1 { | 			if args.Len() < 1 { | ||||||
| 			log.Fatalf("Command remove expected at least 1 argument, got %d", args.Len()).Send() | 				slog.Error(gotext.Get("Command remove expected at least 1 argument, got %d", args.Len())) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			mgr := manager.Detect() | 			mgr := manager.Detect() | ||||||
| 			if mgr == nil { | 			if mgr == nil { | ||||||
| 			log.Fatal("Unable to detect a supported package manager on the system").Send() | 				slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			err := mgr.Remove(nil, c.Args().Slice()...) | 			err := mgr.Remove(nil, c.Args().Slice()...) | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 			log.Fatal("Error removing packages").Err(err).Send() | 				slog.Error(gotext.Get("Error removing packages"), "err", err) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			return nil | 			return nil | ||||||
| 		}, | 		}, | ||||||
|  | 	} | ||||||
| } | } | ||||||
|   | |||||||
| @@ -21,16 +21,15 @@ 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" | ||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/pager" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/pager" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/translations" |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/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 | ||||||
| @@ -39,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, | ||||||
| @@ -54,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 | ||||||
| 	} | 	} | ||||||
| @@ -72,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) | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| @@ -106,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 { | ||||||
| @@ -135,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 | ||||||
| @@ -156,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 | ||||||
|   | |||||||
| @@ -21,14 +21,16 @@ package config | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"context" | 	"context" | ||||||
|  | 	"log/slog" | ||||||
| 	"os" | 	"os" | ||||||
| 	"path/filepath" | 	"path/filepath" | ||||||
| 	"sync" | 	"sync" | ||||||
|  |  | ||||||
| 	"github.com/pelletier/go-toml/v2" | 	"github.com/pelletier/go-toml/v2" | ||||||
|  |  | ||||||
|  | 	"github.com/leonelquinteros/gotext" | ||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| ) | ) | ||||||
|  |  | ||||||
| type ALRConfig struct { | type ALRConfig struct { | ||||||
| @@ -43,6 +45,7 @@ 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", | ||||||
| @@ -56,10 +59,9 @@ func New() *ALRConfig { | |||||||
| } | } | ||||||
|  |  | ||||||
| func (c *ALRConfig) Load(ctx context.Context) { | func (c *ALRConfig) Load(ctx context.Context) { | ||||||
| 	log := loggerctx.From(ctx) |  | ||||||
| 	cfgFl, err := os.Open(c.GetPaths(ctx).ConfigPath) | 	cfgFl, err := os.Open(c.GetPaths(ctx).ConfigPath) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Warn("Error opening config file, using defaults").Err(err).Send() | 		slog.Warn(gotext.Get("Error opening config file, using defaults"), "err", err) | ||||||
| 		c.cfg = defaultConfig | 		c.cfg = defaultConfig | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| @@ -72,27 +74,28 @@ func (c *ALRConfig) Load(ctx context.Context) { | |||||||
|  |  | ||||||
| 	err = toml.NewDecoder(cfgFl).Decode(config) | 	err = toml.NewDecoder(cfgFl).Decode(config) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Warn("Error decoding config file, using defaults").Err(err).Send() | 		slog.Warn(gotext.Get("Error decoding config file, using defaults"), "err", err) | ||||||
| 		c.cfg = defaultConfig | 		c.cfg = defaultConfig | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 	c.cfg = config | 	c.cfg = config | ||||||
| } | } | ||||||
|  |  | ||||||
| func (c *ALRConfig) initPaths(ctx context.Context) { | func (c *ALRConfig) initPaths() { | ||||||
| 	log := loggerctx.From(ctx) |  | ||||||
| 	paths := &Paths{} | 	paths := &Paths{} | ||||||
|  |  | ||||||
| 	cfgDir, err := os.UserConfigDir() | 	cfgDir, err := os.UserConfigDir() | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Fatal("Unable to detect user config directory").Err(err).Send() | 		slog.Error(gotext.Get("Unable to detect user config directory"), "err", err) | ||||||
|  | 		os.Exit(1) | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	paths.ConfigDir = filepath.Join(cfgDir, "alr") | 	paths.ConfigDir = filepath.Join(cfgDir, "alr") | ||||||
|  |  | ||||||
| 	err = os.MkdirAll(paths.ConfigDir, 0o755) | 	err = os.MkdirAll(paths.ConfigDir, 0o755) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Fatal("Unable to create ALR config directory").Err(err).Send() | 		slog.Error(gotext.Get("Unable to create ALR config directory"), "err", err) | ||||||
|  | 		os.Exit(1) | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	paths.ConfigPath = filepath.Join(paths.ConfigDir, "alr.toml") | 	paths.ConfigPath = filepath.Join(paths.ConfigDir, "alr.toml") | ||||||
| @@ -100,12 +103,14 @@ func (c *ALRConfig) initPaths(ctx context.Context) { | |||||||
| 	if _, err := os.Stat(paths.ConfigPath); err != nil { | 	if _, err := os.Stat(paths.ConfigPath); err != nil { | ||||||
| 		cfgFl, err := os.Create(paths.ConfigPath) | 		cfgFl, err := os.Create(paths.ConfigPath) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			log.Fatal("Unable to create ALR config file").Err(err).Send() | 			slog.Error(gotext.Get("Unable to create ALR config file"), "err", err) | ||||||
|  | 			os.Exit(1) | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		err = toml.NewEncoder(cfgFl).Encode(&defaultConfig) | 		err = toml.NewEncoder(cfgFl).Encode(&defaultConfig) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			log.Fatal("Error encoding default configuration").Err(err).Send() | 			slog.Error(gotext.Get("Error encoding default configuration"), "err", err) | ||||||
|  | 			os.Exit(1) | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| 		cfgFl.Close() | 		cfgFl.Close() | ||||||
| @@ -113,7 +118,8 @@ func (c *ALRConfig) initPaths(ctx context.Context) { | |||||||
|  |  | ||||||
| 	cacheDir, err := os.UserCacheDir() | 	cacheDir, err := os.UserCacheDir() | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Fatal("Unable to detect cache directory").Err(err).Send() | 		slog.Error(gotext.Get("Unable to detect cache directory"), "err", err) | ||||||
|  | 		os.Exit(1) | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	paths.CacheDir = filepath.Join(cacheDir, "alr") | 	paths.CacheDir = filepath.Join(cacheDir, "alr") | ||||||
| @@ -122,12 +128,14 @@ func (c *ALRConfig) initPaths(ctx context.Context) { | |||||||
|  |  | ||||||
| 	err = os.MkdirAll(paths.RepoDir, 0o755) | 	err = os.MkdirAll(paths.RepoDir, 0o755) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Fatal("Unable to create repo cache directory").Err(err).Send() | 		slog.Error(gotext.Get("Unable to create repo cache directory"), "err", err) | ||||||
|  | 		os.Exit(1) | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	err = os.MkdirAll(paths.PkgsDir, 0o755) | 	err = os.MkdirAll(paths.PkgsDir, 0o755) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		log.Fatal("Unable to create package cache directory").Err(err).Send() | 		slog.Error(gotext.Get("Unable to create package cache directory"), "err", err) | ||||||
|  | 		os.Exit(1) | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	paths.DBPath = filepath.Join(paths.CacheDir, "db") | 	paths.DBPath = filepath.Join(paths.CacheDir, "db") | ||||||
| @@ -137,7 +145,7 @@ func (c *ALRConfig) initPaths(ctx context.Context) { | |||||||
|  |  | ||||||
| func (c *ALRConfig) GetPaths(ctx context.Context) *Paths { | func (c *ALRConfig) GetPaths(ctx context.Context) *Paths { | ||||||
| 	c.pathsOnce.Do(func() { | 	c.pathsOnce.Do(func() { | ||||||
| 		c.initPaths(ctx) | 		c.initPaths() | ||||||
| 	}) | 	}) | ||||||
| 	return c.paths | 	return c.paths | ||||||
| } | } | ||||||
| @@ -155,3 +163,10 @@ func (c *ALRConfig) IgnorePkgUpdates(ctx context.Context) []string { | |||||||
| 	}) | 	}) | ||||||
| 	return c.cfg.IgnorePkgUpdates | 	return c.cfg.IgnorePkgUpdates | ||||||
| } | } | ||||||
|  |  | ||||||
|  | func (c *ALRConfig) AutoPull(ctx context.Context) bool { | ||||||
|  | 	c.cfgOnce.Do(func() { | ||||||
|  | 		c.Load(ctx) | ||||||
|  | 	}) | ||||||
|  | 	return c.cfg.AutoPull | ||||||
|  | } | ||||||
|   | |||||||
| @@ -21,13 +21,13 @@ 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" | ||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| ) | ) | ||||||
|  |  | ||||||
| var ( | var ( | ||||||
| @@ -43,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()) | ||||||
|   | |||||||
| @@ -21,11 +21,12 @@ package db | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"context" | 	"context" | ||||||
|  | 	"log/slog" | ||||||
|  |  | ||||||
| 	"github.com/jmoiron/sqlx" | 	"github.com/jmoiron/sqlx" | ||||||
|  | 	"github.com/leonelquinteros/gotext" | ||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // CurrentVersion is the current version of the database. | // CurrentVersion is the current version of the database. | ||||||
| @@ -94,7 +95,6 @@ func (d *Database) GetConn() *sqlx.DB { | |||||||
| } | } | ||||||
|  |  | ||||||
| func (d *Database) initDB(ctx context.Context) error { | func (d *Database) initDB(ctx context.Context) error { | ||||||
| 	log := loggerctx.From(ctx) |  | ||||||
| 	d.conn = d.conn.Unsafe() | 	d.conn = d.conn.Unsafe() | ||||||
| 	conn := d.conn | 	conn := d.conn | ||||||
| 	_, err := conn.ExecContext(ctx, ` | 	_, err := conn.ExecContext(ctx, ` | ||||||
| @@ -128,11 +128,11 @@ func (d *Database) initDB(ctx context.Context) error { | |||||||
|  |  | ||||||
| 	ver, ok := d.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) | ||||||
| 		d.reset(ctx) | 		d.reset(ctx) | ||||||
| 		return d.initDB(ctx) | 		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 d.addVersion(ctx, CurrentVersion) | 		return d.addVersion(ctx, CurrentVersion) | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|   | |||||||
| @@ -18,12 +18,14 @@ package db | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"context" | 	"context" | ||||||
|  | 	"log/slog" | ||||||
|  | 	"os" | ||||||
| 	"sync" | 	"sync" | ||||||
|  |  | ||||||
| 	"github.com/jmoiron/sqlx" | 	"github.com/jmoiron/sqlx" | ||||||
|  | 	"github.com/leonelquinteros/gotext" | ||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // DB returns the ALR database. | // DB returns the ALR database. | ||||||
| @@ -92,12 +94,12 @@ var ( | |||||||
| // Deprecated: For legacy only | // Deprecated: For legacy only | ||||||
| func GetInstance(ctx context.Context) *Database { | func GetInstance(ctx context.Context) *Database { | ||||||
| 	dbOnce.Do(func() { | 	dbOnce.Do(func() { | ||||||
| 		log := loggerctx.From(ctx) |  | ||||||
| 		cfg := config.GetInstance(ctx) | 		cfg := config.GetInstance(ctx) | ||||||
| 		database = New(cfg) | 		database = New(cfg) | ||||||
| 		err := database.Init(ctx) | 		err := database.Init(ctx) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			log.Fatal("Error opening database").Err(err).Send() | 			slog.Error(gotext.Get("Error opening database"), "err", err) | ||||||
|  | 			os.Exit(1) | ||||||
| 		} | 		} | ||||||
| 	}) | 	}) | ||||||
| 	return database | 	return database | ||||||
|   | |||||||
| @@ -31,11 +31,13 @@ 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" | ||||||
| @@ -43,7 +45,6 @@ import ( | |||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/dlcache" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/dlcache" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // Константа для имени файла манифеста кэша | // Константа для имени файла манифеста кэша | ||||||
| @@ -144,7 +145,6 @@ 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) | 	cfg := config.GetInstance(ctx) | ||||||
| 	dc := dlcache.New(cfg) | 	dc := dlcache.New(cfg) | ||||||
|  |  | ||||||
| @@ -166,7 +166,11 @@ func Download(ctx context.Context, opts Options) (err error) { | |||||||
| 	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, | ||||||
| @@ -193,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 { | ||||||
| @@ -207,7 +219,7 @@ 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 = dc.New(ctx, opts.URL) | 	cacheDir, err = dc.New(ctx, opts.URL) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
|   | |||||||
							
								
								
									
										93
									
								
								internal/logger/log.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										93
									
								
								internal/logger/log.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,93 @@ | |||||||
|  | // 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) | ||||||
|  | 	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) | ||||||
|  | } | ||||||
							
								
								
									
										446
									
								
								internal/translations/default.pot
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										446
									
								
								internal/translations/default.pot
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,446 @@ | |||||||
|  | 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:44 | ||||||
|  | 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:104 | ||||||
|  | msgid "Failed to prompt user to view build script" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:108 | ||||||
|  | msgid "Building package" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:152 | ||||||
|  | msgid "Downloading sources" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:164 | ||||||
|  | msgid "Building package metadata" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:186 | ||||||
|  | msgid "Compressing package" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:312 | ||||||
|  | msgid "" | ||||||
|  | "Your system's CPU architecture doesn't match this package. Do you want to " | ||||||
|  | "build anyway?" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:323 | ||||||
|  | msgid "This package is already installed" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:351 | ||||||
|  | msgid "Installing build dependencies" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:393 | ||||||
|  | msgid "Installing dependencies" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:435 | ||||||
|  | msgid "Executing version()" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:460 | ||||||
|  | msgid "Executing prepare()" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:470 | ||||||
|  | msgid "Executing build()" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:482 | ||||||
|  | msgid "Executing package()" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:557 | ||||||
|  | msgid "AutoProv is not implemented for this package format, so it's skiped" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:568 | ||||||
|  | msgid "AutoReq is not implemented for this package format, so it's skiped" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:653 | ||||||
|  | msgid "Would you like to remove the build dependencies?" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:759 | ||||||
|  | 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 minumum 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 "" | ||||||
| @@ -1,174 +0,0 @@ | |||||||
| # 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/>. |  | ||||||
|  |  | ||||||
| [[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,170 +0,0 @@ | |||||||
| # 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/>. |  | ||||||
|  |  | ||||||
| [[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 = 'протокол-скачивание' |  | ||||||
							
								
								
									
										455
									
								
								internal/translations/po/ru/default.po
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										455
									
								
								internal/translations/po/ru/default.po
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,455 @@ | |||||||
|  | # | ||||||
|  | # Maxim Slipenko <maks1ms@alt-gnome.ru>, 2025. | ||||||
|  | # | ||||||
|  | msgid "" | ||||||
|  | msgstr "" | ||||||
|  | "Project-Id-Version: unnamed project\n" | ||||||
|  | "PO-Revision-Date: 2025-01-22 16:50+0300\n" | ||||||
|  | "Last-Translator: Maxim Slipenko <maks1ms@alt-gnome.ru>\n" | ||||||
|  | "Language-Team: Russian\n" | ||||||
|  | "Language: ru\n" | ||||||
|  | "MIME-Version: 1.0\n" | ||||||
|  | "Content-Type: text/plain; charset=UTF-8\n" | ||||||
|  | "Content-Transfer-Encoding: 8bit\n" | ||||||
|  | "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" | ||||||
|  | "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" | ||||||
|  | "X-Generator: Gtranslator 47.1\n" | ||||||
|  |  | ||||||
|  | #: build.go:41 | ||||||
|  | #, fuzzy | ||||||
|  | msgid "Build a local package" | ||||||
|  | msgstr "Сборка пакета" | ||||||
|  |  | ||||||
|  | #: build.go:47 | ||||||
|  | #, fuzzy | ||||||
|  | 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 "Показать скрипт для пакета %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 "" | ||||||
|  |  | ||||||
|  | #: 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:44 | ||||||
|  | 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:104 | ||||||
|  | msgid "Failed to prompt user to view build script" | ||||||
|  | msgstr "Не удалось предложить просмотреть скрипт" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:108 | ||||||
|  | msgid "Building package" | ||||||
|  | msgstr "Сборка пакета" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:152 | ||||||
|  | msgid "Downloading sources" | ||||||
|  | msgstr "Скачивание файлов" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:164 | ||||||
|  | msgid "Building package metadata" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:186 | ||||||
|  | msgid "Compressing package" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:312 | ||||||
|  | msgid "" | ||||||
|  | "Your system's CPU architecture doesn't match this package. Do you want to " | ||||||
|  | "build anyway?" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:323 | ||||||
|  | msgid "This package is already installed" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:351 | ||||||
|  | msgid "Installing build dependencies" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:393 | ||||||
|  | msgid "Installing dependencies" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:435 | ||||||
|  | msgid "Executing version()" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:460 | ||||||
|  | msgid "Executing prepare()" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:470 | ||||||
|  | msgid "Executing build()" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:482 | ||||||
|  | msgid "Executing package()" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:557 | ||||||
|  | msgid "AutoProv is not implemented for this package format, so it's skiped" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:568 | ||||||
|  | msgid "AutoReq is not implemented for this package format, so it's skiped" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:653 | ||||||
|  | msgid "Would you like to remove the build dependencies?" | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: pkg/build/build.go:759 | ||||||
|  | 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 minumum ALR version is greater than the current version. Try " | ||||||
|  | "updating ALR if something doesn't work." | ||||||
|  | msgstr "" | ||||||
|  |  | ||||||
|  | #: repo.go:41 | ||||||
|  | #, fuzzy | ||||||
|  | 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 "" | ||||||
| @@ -20,39 +20,33 @@ | |||||||
| 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" |  | ||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/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 |  | ||||||
| ) |  | ||||||
|  |  | ||||||
| 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 { | 	if err != nil { | ||||||
| 			log.Fatal("Error creating new translator").Err(err).Send() | 		panic(err) | ||||||
| 	} | 	} | ||||||
| 		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}) | ||||||
| } | } | ||||||
|   | |||||||
| @@ -26,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 | ||||||
|   | |||||||
							
								
								
									
										32
									
								
								list.go
									
									
									
									
									
								
							
							
						
						
									
										32
									
								
								list.go
									
									
									
									
									
								
							| @@ -21,20 +21,23 @@ 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" | ||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | ||||||
| 	database "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/pkg/loggerctx" |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| var listCmd = &cli.Command{ | func ListCmd() *cli.Command { | ||||||
|  | 	return &cli.Command{ | ||||||
| 		Name:    "list", | 		Name:    "list", | ||||||
| 	Usage:   "List ALR repo packages", | 		Usage:   gotext.Get("List ALR repo packages"), | ||||||
| 		Aliases: []string{"ls"}, | 		Aliases: []string{"ls"}, | ||||||
| 		Flags: []cli.Flag{ | 		Flags: []cli.Flag{ | ||||||
| 			&cli.BoolFlag{ | 			&cli.BoolFlag{ | ||||||
| @@ -44,17 +47,21 @@ var listCmd = &cli.Command{ | |||||||
| 		}, | 		}, | ||||||
| 		Action: func(c *cli.Context) error { | 		Action: func(c *cli.Context) error { | ||||||
| 			ctx := c.Context | 			ctx := c.Context | ||||||
| 		log := loggerctx.From(ctx) |  | ||||||
| 			cfg := config.New() | 			cfg := config.New() | ||||||
| 			db := database.New(cfg) | 			db := database.New(cfg) | ||||||
| 			err := db.Init(ctx) | 			err := db.Init(ctx) | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 			log.Fatal("Error initialization database").Err(err).Send() | 				slog.Error(gotext.Get("Error initialization database"), "err", err) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
| 			rs := repos.New(cfg, db) | 			rs := repos.New(cfg, db) | ||||||
|  |  | ||||||
|  | 			if cfg.AutoPull(ctx) { | ||||||
| 				err = rs.Pull(ctx, cfg.Repos(ctx)) | 				err = rs.Pull(ctx, cfg.Repos(ctx)) | ||||||
| 				if err != nil { | 				if err != nil { | ||||||
| 			log.Fatal("Error pulling repositories").Err(err).Send() | 					slog.Error(gotext.Get("Error pulling repositories"), "err", err) | ||||||
|  | 					os.Exit(1) | ||||||
|  | 				} | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			where := "true" | 			where := "true" | ||||||
| @@ -66,7 +73,8 @@ var listCmd = &cli.Command{ | |||||||
|  |  | ||||||
| 			result, err := db.GetPkgs(ctx, where, args...) | 			result, err := db.GetPkgs(ctx, where, args...) | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 			log.Fatal("Error getting packages").Err(err).Send() | 				slog.Error(gotext.Get("Error getting packages"), "err", err) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
| 			defer result.Close() | 			defer result.Close() | ||||||
|  |  | ||||||
| @@ -74,12 +82,14 @@ var listCmd = &cli.Command{ | |||||||
| 			if c.Bool("installed") { | 			if c.Bool("installed") { | ||||||
| 				mgr := manager.Detect() | 				mgr := manager.Detect() | ||||||
| 				if mgr == nil { | 				if mgr == nil { | ||||||
| 				log.Fatal("Unable to detect a supported package manager on the system").Send() | 					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}) | 				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 listing installed packages"), "err", err) | ||||||
|  | 					os.Exit(1) | ||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| @@ -108,9 +118,11 @@ var listCmd = &cli.Command{ | |||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 			log.Fatal("Error iterating over packages").Err(err).Send() | 				slog.Error(gotext.Get("Error iterating over packages"), "err", err) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			return nil | 			return nil | ||||||
| 		}, | 		}, | ||||||
|  | 	} | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										73
									
								
								main.go
									
									
									
									
									
								
							
							
						
						
									
										73
									
								
								main.go
									
									
									
									
									
								
							| @@ -21,60 +21,74 @@ 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" |  | ||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/translations" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/translations" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" | ||||||
|  |  | ||||||
|  | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/logger" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| var app = &cli.App{ | func VersionCmd() *cli.Command { | ||||||
|  | 	return &cli.Command{ | ||||||
|  | 		Name:  "version", | ||||||
|  | 		Usage: gotext.Get("Print the current ALR version and exit"), | ||||||
|  | 		Action: func(ctx *cli.Context) error { | ||||||
|  | 			println(config.Version) | ||||||
|  | 			return nil | ||||||
|  | 		}, | ||||||
|  | 	} | ||||||
|  | } | ||||||
|  |  | ||||||
|  | func GetApp() *cli.App { | ||||||
|  | 	return &cli.App{ | ||||||
| 		Name:  "alr", | 		Name:  "alr", | ||||||
| 		Usage: "Any Linux Repository", | 		Usage: "Any Linux Repository", | ||||||
| 		Flags: []cli.Flag{ | 		Flags: []cli.Flag{ | ||||||
| 			&cli.StringFlag{ | 			&cli.StringFlag{ | ||||||
| 				Name:    "pm-args", | 				Name:    "pm-args", | ||||||
| 				Aliases: []string{"P"}, | 				Aliases: []string{"P"}, | ||||||
| 			Usage:   "Arguments to be passed on to the package manager", | 				Usage:   gotext.Get("Arguments to be passed on to the package manager"), | ||||||
| 			}, | 			}, | ||||||
| 			&cli.BoolFlag{ | 			&cli.BoolFlag{ | ||||||
| 				Name:    "interactive", | 				Name:    "interactive", | ||||||
| 				Aliases: []string{"i"}, | 				Aliases: []string{"i"}, | ||||||
| 				Value:   isatty.IsTerminal(os.Stdin.Fd()), | 				Value:   isatty.IsTerminal(os.Stdin.Fd()), | ||||||
| 			Usage:   "Enable interactive questions and prompts", | 				Usage:   gotext.Get("Enable interactive questions and prompts"), | ||||||
| 			}, | 			}, | ||||||
| 		}, | 		}, | ||||||
| 		Commands: []*cli.Command{ | 		Commands: []*cli.Command{ | ||||||
| 		installCmd, | 			InstallCmd(), | ||||||
| 		removeCmd, | 			RemoveCmd(), | ||||||
| 		upgradeCmd, | 			UpgradeCmd(), | ||||||
| 		infoCmd, | 			InfoCmd(), | ||||||
| 		listCmd, | 			ListCmd(), | ||||||
| 		buildCmd, | 			BuildCmd(), | ||||||
| 		addrepoCmd, | 			AddRepoCmd(), | ||||||
| 		removerepoCmd, | 			RemoveRepoCmd(), | ||||||
| 		refreshCmd, | 			RefreshCmd(), | ||||||
| 		fixCmd, | 			FixCmd(), | ||||||
| 		genCmd, | 			GenCmd(), | ||||||
| 		helperCmd, | 			HelperCmd(), | ||||||
| 		versionCmd, | 			VersionCmd(), | ||||||
| 		}, | 		}, | ||||||
| 		Before: func(c *cli.Context) error { | 		Before: func(c *cli.Context) error { | ||||||
| 			ctx := c.Context | 			ctx := c.Context | ||||||
| 		log := loggerctx.From(ctx) |  | ||||||
|  |  | ||||||
| 			cmd := c.Args().First() | 			cmd := c.Args().First() | ||||||
| 			if cmd != "helper" && !config.Config(ctx).Unsafe.AllowRunAsRoot && os.Geteuid() == 0 { | 			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() | 				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 != "" { | 			if trimmed := strings.TrimSpace(c.String("pm-args")); trimmed != "" { | ||||||
| @@ -88,21 +102,16 @@ var app = &cli.App{ | |||||||
| 			return db.Close() | 			return db.Close() | ||||||
| 		}, | 		}, | ||||||
| 		EnableBashCompletion: true, | 		EnableBashCompletion: true, | ||||||
| } | 	} | ||||||
|  |  | ||||||
| var versionCmd = &cli.Command{ |  | ||||||
| 	Name:  "version", |  | ||||||
| 	Usage: "Print the current ALR version and exit", |  | ||||||
| 	Action: func(ctx *cli.Context) error { |  | ||||||
| 		println(config.Version) |  | ||||||
| 		return nil |  | ||||||
| 	}, |  | ||||||
| } | } | ||||||
|  |  | ||||||
| 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 | ||||||
| @@ -112,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) | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|   | |||||||
| @@ -25,6 +25,7 @@ import ( | |||||||
| 	"encoding/hex" | 	"encoding/hex" | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 	"io" | 	"io" | ||||||
|  | 	"log/slog" | ||||||
| 	"os" | 	"os" | ||||||
| 	"path/filepath" | 	"path/filepath" | ||||||
| 	"runtime" | 	"runtime" | ||||||
| @@ -38,7 +39,7 @@ import ( | |||||||
| 	_ "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" | ||||||
| 	"go.elara.ws/logger/log" | 	"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/syntax" | 	"mvdan.cc/sh/v3/syntax" | ||||||
| @@ -56,7 +57,6 @@ import ( | |||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/helpers" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/helpers" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | ||||||
| ) | ) | ||||||
| @@ -64,7 +64,6 @@ import ( | |||||||
| // Функция 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) | 	reposInstance := repos.GetInstance(ctx) | ||||||
|  |  | ||||||
| 	info, err := distro.ParseOSRelease(ctx) | 	info, err := distro.ParseOSRelease(ctx) | ||||||
| @@ -102,10 +101,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) | ||||||
|  |  | ||||||
| 	// Второй проход будет использоваться для выполнения реального кода, | 	// Второй проход будет использоваться для выполнения реального кода, | ||||||
| 	// поэтому он не ограничен. Скрипт уже был показан | 	// поэтому он не ограничен. Скрипт уже был показан | ||||||
| @@ -149,7 +149,7 @@ 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 { | ||||||
| @@ -161,7 +161,7 @@ func BuildPackage(ctx context.Context, opts types.BuildOpts) ([]string, []string | |||||||
| 		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) // Получаем формат пакета | ||||||
|  |  | ||||||
| @@ -183,7 +183,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 { | ||||||
| @@ -308,9 +308,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 | ||||||
| 		} | 		} | ||||||
| @@ -321,10 +320,10 @@ 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 | ||||||
| @@ -337,7 +336,6 @@ type PackageFinder interface { | |||||||
| // Функция installBuildDeps устанавливает все зависимости сборки, которые еще не установлены, и возвращает | // Функция installBuildDeps устанавливает все зависимости сборки, которые еще не установлены, и возвращает | ||||||
| // срез, содержащий имена всех установленных пакетов. | // срез, содержащий имена всех установленных пакетов. | ||||||
| func installBuildDeps(ctx context.Context, repos PackageFinder, vars *types.BuildVars, opts types.BuildOpts) ([]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 { | ||||||
| 		deps, err := removeAlreadyInstalled(opts, vars.BuildDepends) | 		deps, err := removeAlreadyInstalled(opts, vars.BuildDepends) | ||||||
| @@ -350,7 +348,7 @@ func installBuildDeps(ctx context.Context, repos PackageFinder, vars *types.Buil | |||||||
| 			return nil, err | 			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) | ||||||
| @@ -391,9 +389,8 @@ func installOptDeps(ctx context.Context, repos PackageFinder, vars *types.BuildV | |||||||
| // пакетов, которые она собрала, а также все зависимости, которые не были найдены в 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 { | ||||||
| @@ -433,10 +430,9 @@ func buildALRDeps(ctx context.Context, opts types.BuildOpts, vars *types.BuildVa | |||||||
|  |  | ||||||
| // Функция 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) (err 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{} | ||||||
|  |  | ||||||
| @@ -456,12 +452,12 @@ func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Dire | |||||||
| 		} | 		} | ||||||
| 		vars.Version = newVer | 		vars.Version = newVer | ||||||
|  |  | ||||||
| 		log.Info("Updating version").Str("new", newVer).Send() | 		slog.Info("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 { | ||||||
| @@ -471,7 +467,7 @@ func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Dire | |||||||
|  |  | ||||||
| 	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 { | ||||||
| @@ -483,17 +479,18 @@ 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 err | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
|  | 		/* | ||||||
| 			// Проверка на наличие дополнительных функций package_* | 			// Проверка на наличие дополнительных функций package_* | ||||||
| 			packageFuncName := "package_" | 			packageFuncName := "package_" | ||||||
| 			if packageFunc, ok := dec.GetFunc(packageFuncName); ok { | 			if packageFunc, ok := dec.GetFunc(packageFuncName); ok { | ||||||
| 			log.Info("Executing " + packageFuncName).Send() | 				slog.Info("Executing " + packageFuncName) | ||||||
| 				err = packageFunc(ctx, interp.Dir(dirs.SrcDir)) | 				err = packageFunc(ctx, interp.Dir(dirs.SrcDir)) | ||||||
| 				if err != nil { | 				if err != nil { | ||||||
| 					return err | 					return err | ||||||
| @@ -501,6 +498,8 @@ func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Dire | |||||||
| 			} else { | 			} else { | ||||||
| 				break // Если больше нет функций package_*, выходим из цикла | 				break // Если больше нет функций package_*, выходим из цикла | ||||||
| 			} | 			} | ||||||
|  | 		*/ | ||||||
|  | 		break | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	return nil | 	return nil | ||||||
| @@ -555,7 +554,7 @@ func buildPkgMetadata(ctx context.Context, vars *types.BuildVars, dirs types.Dir | |||||||
| 				return nil, err | 				return nil, err | ||||||
| 			} | 			} | ||||||
| 		} else { | 		} else { | ||||||
| 			log.Info("AutoProv is not implemented for this package format, so it's skiped").Send() | 			slog.Info(gotext.Get("AutoProv is not implemented for this package format, so it's skiped")) | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| @@ -566,7 +565,7 @@ func buildPkgMetadata(ctx context.Context, vars *types.BuildVars, dirs types.Dir | |||||||
| 				return nil, err | 				return nil, err | ||||||
| 			} | 			} | ||||||
| 		} else { | 		} else { | ||||||
| 			log.Info("AutoReq is not implemented for this package format, so it's skiped").Send() | 			slog.Info(gotext.Get("AutoReq is not implemented for this package format, so it's skiped")) | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| @@ -651,7 +650,7 @@ func buildContents(vars *types.BuildVars, dirs types.Directories) ([]*files.Cont | |||||||
| // установленные для сборки. Если да, использует менеджер пакетов для их удаления. | // установленные для сборки. Если да, использует менеджер пакетов для их удаления. | ||||||
| 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 | ||||||
| 		} | 		} | ||||||
| @@ -756,9 +755,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 { | ||||||
|   | |||||||
| @@ -19,21 +19,20 @@ 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" | ||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/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 | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| @@ -64,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()).Send() | 		slog.Error(stderr.String()) | ||||||
| 		return err | 		return err | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| @@ -79,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) | ||||||
| 	}) | 	}) | ||||||
| } | } | ||||||
|   | |||||||
| @@ -21,24 +21,26 @@ package build | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"context" | 	"context" | ||||||
|  | 	"log/slog" | ||||||
|  | 	"os" | ||||||
| 	"path/filepath" | 	"path/filepath" | ||||||
|  |  | ||||||
|  | 	"github.com/leonelquinteros/gotext" | ||||||
|  |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| ) | ) | ||||||
|  |  | ||||||
| // 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) | ||||||
| 			// Логируем и завершаем выполнение при ошибке | 			// Логируем и завершаем выполнение при ошибке | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
| @@ -61,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,48 +0,0 @@ | |||||||
| // 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 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() |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
| @@ -22,6 +22,7 @@ package repos | |||||||
| import ( | import ( | ||||||
| 	"context" | 	"context" | ||||||
| 	"errors" | 	"errors" | ||||||
|  | 	"log/slog" | ||||||
| 	"net/url" | 	"net/url" | ||||||
| 	"os" | 	"os" | ||||||
| 	"path/filepath" | 	"path/filepath" | ||||||
| @@ -31,6 +32,7 @@ import ( | |||||||
| 	"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/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" | ||||||
| @@ -41,7 +43,6 @@ import ( | |||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| ) | ) | ||||||
|  |  | ||||||
| type actionType uint8 | type actionType uint8 | ||||||
| @@ -61,8 +62,6 @@ type action struct { | |||||||
| // 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 (rs *Repos) 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 = rs.cfg.Repos(ctx) | 		repos = rs.cfg.Repos(ctx) | ||||||
| 	} | 	} | ||||||
| @@ -73,7 +72,7 @@ func (rs *Repos) 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 | ||||||
| @@ -97,7 +96,7 @@ func (rs *Repos) 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 | ||||||
| 			} | 			} | ||||||
| @@ -154,7 +153,7 @@ func (rs *Repos) 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 | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
| @@ -170,7 +169,7 @@ func (rs *Repos) 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 minumum ALR version is greater than the current version. Try updating ALR if something doesn't work."), "repo", repo.Name) | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|   | |||||||
							
								
								
									
										60
									
								
								repo.go
									
									
									
									
									
								
							
							
						
						
									
										60
									
								
								repo.go
									
									
									
									
									
								
							| @@ -20,9 +20,11 @@ | |||||||
| 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" | ||||||
| @@ -30,31 +32,30 @@ import ( | |||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| var addrepoCmd = &cli.Command{ | func AddRepoCmd() *cli.Command { | ||||||
|  | 	return &cli.Command{ | ||||||
| 		Name:    "addrepo", | 		Name:    "addrepo", | ||||||
| 	Usage:   "Add a new repository", | 		Usage:   gotext.Get("Add a new repository"), | ||||||
| 		Aliases: []string{"ar"}, | 		Aliases: []string{"ar"}, | ||||||
| 		Flags: []cli.Flag{ | 		Flags: []cli.Flag{ | ||||||
| 			&cli.StringFlag{ | 			&cli.StringFlag{ | ||||||
| 				Name:     "name", | 				Name:     "name", | ||||||
| 				Aliases:  []string{"n"}, | 				Aliases:  []string{"n"}, | ||||||
| 				Required: true, | 				Required: true, | ||||||
| 			Usage:    "Name of the new repo", | 				Usage:    gotext.Get("Name of the new repo"), | ||||||
| 			}, | 			}, | ||||||
| 			&cli.StringFlag{ | 			&cli.StringFlag{ | ||||||
| 				Name:     "url", | 				Name:     "url", | ||||||
| 				Aliases:  []string{"u"}, | 				Aliases:  []string{"u"}, | ||||||
| 				Required: true, | 				Required: true, | ||||||
| 			Usage:    "URL of the new repo", | 				Usage:    gotext.Get("URL of the new repo"), | ||||||
| 			}, | 			}, | ||||||
| 		}, | 		}, | ||||||
| 		Action: func(c *cli.Context) error { | 		Action: func(c *cli.Context) error { | ||||||
| 			ctx := c.Context | 			ctx := c.Context | ||||||
| 		log := loggerctx.From(ctx) |  | ||||||
|  |  | ||||||
| 			name := c.String("name") | 			name := c.String("name") | ||||||
| 			repoURL := c.String("url") | 			repoURL := c.String("url") | ||||||
| @@ -63,7 +64,8 @@ var addrepoCmd = &cli.Command{ | |||||||
|  |  | ||||||
| 			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) | ||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| @@ -74,38 +76,42 @@ var addrepoCmd = &cli.Command{ | |||||||
|  |  | ||||||
| 			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) | 			err = toml.NewEncoder(cfgFl).Encode(cfg) | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 			log.Fatal("Error encoding config").Err(err).Send() | 				slog.Error(gotext.Get("Error encoding config"), "err", err) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			err = repos.Pull(ctx, cfg.Repos) | 			err = repos.Pull(ctx, cfg.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) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			return nil | 			return nil | ||||||
| 		}, | 		}, | ||||||
|  | 	} | ||||||
| } | } | ||||||
|  |  | ||||||
| var removerepoCmd = &cli.Command{ | func RemoveRepoCmd() *cli.Command { | ||||||
|  | 	return &cli.Command{ | ||||||
| 		Name:    "removerepo", | 		Name:    "removerepo", | ||||||
| 	Usage:   "Remove an existing repository", | 		Usage:   gotext.Get("Remove an existing repository"), | ||||||
| 		Aliases: []string{"rr"}, | 		Aliases: []string{"rr"}, | ||||||
| 		Flags: []cli.Flag{ | 		Flags: []cli.Flag{ | ||||||
| 			&cli.StringFlag{ | 			&cli.StringFlag{ | ||||||
| 				Name:     "name", | 				Name:     "name", | ||||||
| 				Aliases:  []string{"n"}, | 				Aliases:  []string{"n"}, | ||||||
| 				Required: true, | 				Required: true, | ||||||
| 			Usage:    "Name of the repo to be deleted", | 				Usage:    gotext.Get("Name of the repo to be deleted"), | ||||||
| 			}, | 			}, | ||||||
| 		}, | 		}, | ||||||
| 		Action: func(c *cli.Context) error { | 		Action: func(c *cli.Context) error { | ||||||
| 			ctx := c.Context | 			ctx := c.Context | ||||||
| 		log := loggerctx.From(ctx) |  | ||||||
|  |  | ||||||
| 			name := c.String("name") | 			name := c.String("name") | ||||||
| 			cfg := config.Config(ctx) | 			cfg := config.Config(ctx) | ||||||
| @@ -119,46 +125,54 @@ var removerepoCmd = &cli.Command{ | |||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
| 			if !found { | 			if !found { | ||||||
| 			log.Fatal("Repo does not exist").Str("name", name).Send() | 				slog.Error(gotext.Get("Repo does not exist"), "name", name) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			cfg.Repos = slices.Delete(cfg.Repos, index, index+1) | 			cfg.Repos = slices.Delete(cfg.Repos, index, index+1) | ||||||
|  |  | ||||||
| 			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) | 			err = toml.NewEncoder(cfgFl).Encode(&cfg) | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 			log.Fatal("Error encoding config").Err(err).Send() | 				slog.Error(gotext.Get("Error encoding config"), "err", err) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			err = os.RemoveAll(filepath.Join(config.GetPaths(ctx).RepoDir, name)) | 			err = os.RemoveAll(filepath.Join(config.GetPaths(ctx).RepoDir, name)) | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 			log.Fatal("Error removing repo directory").Err(err).Send() | 				slog.Error(gotext.Get("Error removing repo directory"), "err", err) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			err = db.DeletePkgs(ctx, "repository = ?", name) | 			err = db.DeletePkgs(ctx, "repository = ?", name) | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 			log.Fatal("Error removing packages from database").Err(err).Send() | 				slog.Error(gotext.Get("Error removing packages from database"), "err", err) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			return nil | 			return nil | ||||||
| 		}, | 		}, | ||||||
|  | 	} | ||||||
| } | } | ||||||
|  |  | ||||||
| var refreshCmd = &cli.Command{ | func RefreshCmd() *cli.Command { | ||||||
|  | 	return &cli.Command{ | ||||||
| 		Name:    "refresh", | 		Name:    "refresh", | ||||||
| 	Usage:   "Pull all repositories that have changed", | 		Usage:   gotext.Get("Pull all repositories that have changed"), | ||||||
| 		Aliases: []string{"ref"}, | 		Aliases: []string{"ref"}, | ||||||
| 		Action: func(c *cli.Context) error { | 		Action: func(c *cli.Context) error { | ||||||
| 			ctx := c.Context | 			ctx := c.Context | ||||||
| 		log := loggerctx.From(ctx) |  | ||||||
| 			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) | ||||||
| 			} | 			} | ||||||
| 			return nil | 			return nil | ||||||
| 		}, | 		}, | ||||||
|  | 	} | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										30
									
								
								upgrade.go
									
									
									
									
									
								
							
							
						
						
									
										30
									
								
								upgrade.go
									
									
									
									
									
								
							| @@ -22,8 +22,12 @@ 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/logger/log" | ||||||
| 	"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" | ||||||
| @@ -33,44 +37,51 @@ import ( | |||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/types" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/build" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/distro" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/loggerctx" |  | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/manager" | ||||||
| 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | 	"gitea.plemya-x.ru/Plemya-x/ALR/pkg/repos" | ||||||
| ) | ) | ||||||
|  |  | ||||||
| var upgradeCmd = &cli.Command{ | func UpgradeCmd() *cli.Command { | ||||||
|  | 	return &cli.Command{ | ||||||
| 		Name:    "upgrade", | 		Name:    "upgrade", | ||||||
| 	Usage:   "Upgrade all installed packages", | 		Usage:   gotext.Get("Upgrade all installed packages"), | ||||||
| 		Aliases: []string{"up"}, | 		Aliases: []string{"up"}, | ||||||
| 		Flags: []cli.Flag{ | 		Flags: []cli.Flag{ | ||||||
| 			&cli.BoolFlag{ | 			&cli.BoolFlag{ | ||||||
| 				Name:    "clean", | 				Name:    "clean", | ||||||
| 				Aliases: []string{"c"}, | 				Aliases: []string{"c"}, | ||||||
| 			Usage:   "Build package from scratch even if there's an already built package available", | 				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) |  | ||||||
|  | 			cfg := config.GetInstance(ctx) | ||||||
|  |  | ||||||
| 			info, err := distro.ParseOSRelease(ctx) | 			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 parsing os-release file"), "err", err) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			mgr := manager.Detect() | 			mgr := manager.Detect() | ||||||
| 			if mgr == nil { | 			if mgr == nil { | ||||||
| 			log.Fatal("Unable to detect a supported package manager on the system").Send() | 				slog.Error(gotext.Get("Unable to detect a supported package manager on the system")) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
|  | 			if cfg.AutoPull(ctx) { | ||||||
| 				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) | ||||||
|  | 				} | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			updates, err := checkForUpdates(ctx, mgr, info) | 			updates, err := checkForUpdates(ctx, mgr, info) | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 			log.Fatal("Error checking for updates").Err(err).Send() | 				slog.Error(gotext.Get("Error checking for updates"), "err", err) | ||||||
|  | 				os.Exit(1) | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			if len(updates) > 0 { | 			if len(updates) > 0 { | ||||||
| @@ -85,6 +96,7 @@ var upgradeCmd = &cli.Command{ | |||||||
|  |  | ||||||
| 			return nil | 			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) { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user