build.go

@@ -60,28 +60,11 @@ func BuildCmd() *cli.Command {
 		Action: func(c *cli.Context) error {
 			ctx := c.Context
 
-			var script string
+			script := c.String("script")
-
+			if c.String("package") != "" {
-			// Проверяем, установлен ли флаг script (-s)
+				script = filepath.Join(config.GetPaths(ctx).RepoDir, c.String("package"), "alr.sh")
-			if c.IsSet("script") {
-				script = c.String("script")
-			} else if c.IsSet("package") {
-				// Если флаг script не установлен, проверяем флаг package (-p)
-				packageInput := c.String("package")
-				// Определяем, содержит ли packageInput символ '/'
-				if filepath.Dir(packageInput) == "." {
-					// Не указана директория репозитория, используем 'default' как префикс
-					script = filepath.Join(config.GetPaths(ctx).RepoDir, "default", packageInput, "alr.sh")
-				} else {
-					// Используем путь с указанным репозиторием
-					script = filepath.Join(config.GetPaths(ctx).RepoDir, packageInput, "alr.sh")
-				}
-			} else {
-				// Ни флаги script, ни package не установлены, используем дефолтный скрипт
-				script = filepath.Join(config.GetPaths(ctx).RepoDir, "alr.sh")
 			}
 
-			// Проверка автоматического пулла репозиториев
 			if config.GetInstance(ctx).AutoPull(ctx) {
 				err := repos.Pull(ctx, config.Config(ctx).Repos)
 				if err != nil {
@@ -90,14 +73,12 @@ func BuildCmd() *cli.Command {
 				}
 			}
 
-			// Обнаружение менеджера пакетов
 			mgr := manager.Detect()
 			if mgr == nil {
 				slog.Error(gotext.Get("Unable to detect a supported package manager on the system"))
 				os.Exit(1)
 			}
 
-			// Сборка пакета
 			pkgPaths, _, err := build.BuildPackage(ctx, types.BuildOpts{
 				Script:      script,
 				Manager:     mgr,
@@ -109,14 +90,12 @@ func BuildCmd() *cli.Command {
 				os.Exit(1)
 			}
 
-			// Получение текущей рабочей директории
 			wd, err := os.Getwd()
 			if err != nil {
 				slog.Error(gotext.Get("Error getting working directory"), "err", err)
 				os.Exit(1)
 			}
 
-			// Перемещение собранных пакетов в рабочую директорию
 			for _, pkgPath := range pkgPaths {
 				name := filepath.Base(pkgPath)
 				err = osutils.Move(pkgPath, filepath.Join(wd, name))

go.mod

@@ -8,9 +8,9 @@ require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/PuerkitoBio/purell v1.2.0
 	github.com/alecthomas/chroma/v2 v2.9.1
-	github.com/charmbracelet/bubbles v0.20.0
+	github.com/charmbracelet/bubbles v0.16.1
-	github.com/charmbracelet/bubbletea v1.2.4
+	github.com/charmbracelet/bubbletea v0.24.2
-	github.com/charmbracelet/lipgloss v1.0.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-git/v5 v5.12.0
@@ -18,19 +18,19 @@ require (
 	github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/leonelquinteros/gotext v1.7.0
-	github.com/mattn/go-isatty v0.0.20
+	github.com/mattn/go-isatty v0.0.19
 	github.com/mholt/archiver/v4 v4.0.0-alpha.8
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/muesli/reflow v0.3.0
 	github.com/pelletier/go-toml/v2 v2.1.0
-	github.com/schollz/progressbar/v3 v3.18.0
+	github.com/schollz/progressbar/v3 v3.13.1
 	github.com/stretchr/testify v1.10.0
 	github.com/urfave/cli/v2 v2.25.7
 	github.com/vmihailenco/msgpack/v5 v5.3.5
 	go.elara.ws/vercmp v0.0.0-20230622214216-0b2b067575c4
 	golang.org/x/crypto v0.27.0
 	golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb
-	golang.org/x/sys v0.29.0
+	golang.org/x/sys v0.27.0
 	golang.org/x/text v0.21.0
 	gopkg.in/yaml.v3 v3.0.1
 	modernc.org/sqlite v1.25.0
@@ -53,9 +53,6 @@ require (
 	github.com/bodgit/sevenzip v1.3.0 // indirect
 	github.com/bodgit/windows v1.0.0 // indirect
 	github.com/cavaliergopher/cpio v1.0.1 // indirect
-	github.com/charmbracelet/harmonica v0.2.0 // indirect
-	github.com/charmbracelet/x/ansi v0.4.5 // indirect
-	github.com/charmbracelet/x/term v0.2.1 // indirect
 	github.com/cloudflare/circl v1.3.8 // indirect
 	github.com/connesc/cipherio v0.2.1 // indirect
 	github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect
@@ -66,14 +63,12 @@ require (
 	github.com/dsnet/compress v0.0.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // 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/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a // indirect
-	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/google/uuid v1.4.0 // indirect
 	github.com/goreleaser/chglog v0.6.1 // indirect
 	github.com/goreleaser/fileglob v1.3.0 // indirect
@@ -89,12 +84,12 @@ require (
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
-	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
+	github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/termenv v0.15.2 // indirect
 	github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect
@@ -118,7 +113,7 @@ require (
 	golang.org/x/mod v0.18.0 // indirect
 	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/term v0.28.0 // indirect
+	golang.org/x/term v0.25.0 // indirect
 	golang.org/x/tools v0.22.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	lukechampine.com/uint128 v1.2.0 // indirect

go.sum

@@ -75,34 +75,12 @@ github.com/cavaliergopher/cpio v1.0.1/go.mod h1:pBdaqQjnvXxdS/6CvNDwIANIFSP0xRKI
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/charmbracelet/bubbles v0.16.1 h1:6uzpAAaT9ZqKssntbvZMlksWHruQLNxg49H5WdeuYSY=
 github.com/charmbracelet/bubbles v0.16.1/go.mod h1:2QCp9LFlEsBQMvIYERr7Ww2H2bA7xen1idUDIzm/+Xc=
-github.com/charmbracelet/bubbles v0.20.0 h1:jSZu6qD8cRQ6k9OMfR1WlM+ruM8fkPWkHvQWD9LIutE=
-github.com/charmbracelet/bubbles v0.20.0/go.mod h1:39slydyswPy+uVOHZ5x/GjwVAFkCsV8IIVy+4MhzwwU=
 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 v1.1.0 h1:FjAl9eAL3HBCHenhz/ZPjkKdScmaS5SK69JAK2YJK9c=
-github.com/charmbracelet/bubbletea v1.1.0/go.mod h1:9Ogk0HrdbHolIKHdjfFpyXJmiCzGwy+FesYkZr7hYU4=
-github.com/charmbracelet/bubbletea v1.2.4 h1:KN8aCViA0eps9SCOThb2/XPIlea3ANJLUkv3KnQRNCE=
-github.com/charmbracelet/bubbletea v1.2.4/go.mod h1:Qr6fVQw+wX7JkWWkVyXYk/ZUQ92a6XNekLXa3rR18MM=
-github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
-github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
 github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s=
 github.com/charmbracelet/lipgloss v0.10.0/go.mod h1:Wig9DSfvANsxqkRsqj6x87irdy123SR4dOXlKa91ciE=
-github.com/charmbracelet/lipgloss v0.13.0 h1:4X3PPeoWEDCMvzDvGmTajSyYPcZM4+y8sCA/SsA3cjw=
-github.com/charmbracelet/lipgloss v0.13.0/go.mod h1:nw4zy0SBX/F/eAO1cWdcvy6qnkDUxr8Lw7dvFrAIbbY=
-github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
-github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo=
 github.com/charmbracelet/log v0.4.0 h1:G9bQAcx8rWA2T3pWvx7YtPTPwgqpk7D68BX21IRW8ZM=
 github.com/charmbracelet/log v0.4.0/go.mod h1:63bXt/djrizTec0l11H20t8FDSvA4CRZJ1KH22MdptM=
-github.com/charmbracelet/x/ansi v0.2.3 h1:VfFN0NUpcjBRd4DnKfRaIRo53KRgey/nhOoEqosGDEY=
-github.com/charmbracelet/x/ansi v0.2.3/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
-github.com/charmbracelet/x/ansi v0.4.5 h1:LqK4vwBNaXw2AyGIICa5/29Sbdq58GbGdFngSexTdRM=
-github.com/charmbracelet/x/ansi v0.4.5/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
-github.com/charmbracelet/x/term v0.2.0 h1:cNB9Ot9q8I711MyZ7myUR5HFWL/lc3OpU8jZ4hwm0x0=
-github.com/charmbracelet/x/term v0.2.0/go.mod h1:GVxgxAbjUrmpvIINHIQnJJKpMlHiZ4cktEQCN6GWyF0=
-github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
-github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
-github.com/chengxilo/virtualterm v1.0.4 h1:Z6IpERbRVlfB8WkOmtbHiDbBANU7cimRIof7mk9/PwM=
-github.com/chengxilo/virtualterm v1.0.4/go.mod h1:DyxxBZz/x1iqJjFxTFcr6/x+jSpqN0iwWCOK1q10rlY=
 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/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -117,8 +95,9 @@ github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81/go.mod h1:Yyn
 github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
+github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
+github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/creack/pty v1.1.23 h1:4M6+isWdcStXEf15G/RbrMPOQj1dZ7HPZCGwE4kOeP0=
-github.com/creack/pty v1.1.23/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
 github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
 github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -137,8 +116,6 @@ github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
-github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE=
@@ -155,8 +132,6 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
 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-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
-github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
@@ -196,8 +171,6 @@ github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S3
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a h1:JJBdjSfqSy3mnDT0940ASQFghwcZ4y4cb6ttjAoXqwE=
 github.com/google/rpmpack v0.6.1-0.20240329070804-c2247cbb881a/go.mod h1:uqVAUVQLq8UY2hCDfmJ/+rtO3aw7qyhc90rCVEabEfI=
-github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
-github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -237,6 +210,7 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
@@ -268,13 +242,15 @@ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxec
 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.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+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-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
 github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
-github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
 github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
@@ -294,8 +270,6 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b h1:1XF24mVaiu7u+CFywTdcDo2ie1pzzhwjt6RHqzpMU34=
 github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b/go.mod h1:fQuZ0gauxyBcmsdE3ZT4NasjaRdxmbCS0jRHsrWu3Ho=
-github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
-github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
 github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
 github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
@@ -325,15 +299,15 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 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.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
 github.com/sassoftware/go-rpmutils v0.4.0 h1:ojND82NYBxgwrV+mX1CWsd5QJvvEZTKddtCdFLPWhpg=
 github.com/sassoftware/go-rpmutils v0.4.0/go.mod h1:3goNWi7PGAT3/dlql2lv3+MSN5jNYPjT5mVcQcIsYzI=
-github.com/schollz/progressbar/v3 v3.18.0 h1:uXdoHABRFmNIjUfte/Ex7WtuyVslrw2wVPQmCN62HpA=
+github.com/schollz/progressbar/v3 v3.13.1 h1:o8rySDYiQ59Mwzy2FELeHY5ZARXZTVJC7iHD6PEFUiE=
-github.com/schollz/progressbar/v3 v3.18.0/go.mod h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec=
+github.com/schollz/progressbar/v3 v3.13.1/go.mod h1:xvrbki8kfT1fzWzBT/UZd9L6GA+jdL7HAgq2RFnO6fQ=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
@@ -352,6 +326,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -428,6 +403,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.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.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
 golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -450,6 +427,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.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.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
 golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -486,7 +465,6 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -496,15 +474,17 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
-golang.org/x/sys v0.29.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-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 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.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -545,6 +525,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.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.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
 golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -630,6 +612,8 @@ modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg=
 modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 modernc.org/z v1.7.3 h1:zDJf6iHjrnB+WRD88stbXokugjyc0/pB91ri1gO6LZY=
 modernc.org/z v1.7.3/go.mod h1:Ipv4tsdxZRbQyLq9Q1M6gdbkxYzdlrciF2Hi/lS7nWE=
+mvdan.cc/sh/v3 v3.7.0 h1:lSTjdP/1xsddtaKfGg7Myu7DnlHItd3/M2tomOcNNBg=
+mvdan.cc/sh/v3 v3.7.0/go.mod h1:K2gwkaesF/D7av7Kxl0HbF5kGOd2ArupNTX3X44+8l8=
 mvdan.cc/sh/v3 v3.10.0 h1:v9z7N1DLZ7owyLM/SXZQkBSXcwr2IGMm2LY2pmhVXj4=
 mvdan.cc/sh/v3 v3.10.0/go.mod h1:z/mSSVyLFGZzqb3ZIKojjyqIx/xbmz/UHdCSv9HmqXY=
 plemya-x.ru/fakeroot v0.0.0-20240601131003-c638a3543283 h1:BXCLPeA8g2M6qYngicyxyB/2Bo4J54Q9Rb+8jMmE3ik=

internal/dl/dl.go

@@ -134,7 +134,7 @@ type Manifest struct {
 type Downloader interface {
 	Name() string
 	MatchURL(string) bool
-	Download(context.Context, Options) (Type, string, error)
+	Download(Options) (Type, string, error)
 }
 
 // Интерфейс UpdatingDownloader расширяет Downloader методом Update
@@ -157,7 +157,7 @@ func Download(ctx context.Context, opts Options) (err error) {
 	d := getDownloader(opts.URL)
 
 	if opts.CacheDisabled {
-		_, _, err = d.Download(ctx, opts)
+		_, _, err = d.Download(opts)
 		return err
 	}
 
@@ -226,7 +226,7 @@ func Download(ctx context.Context, opts Options) (err error) {
 		return err
 	}
 
-	t, name, err := d.Download(ctx, Options{
+	t, name, err := d.Download(Options{
 		Hash:          opts.Hash,
 		HashAlgorithm: opts.HashAlgorithm,
 		Name:          opts.Name,

internal/dl/file.go

@@ -22,7 +22,6 @@ package dl
 import (
 	"bytes"
 	"context"
-	"fmt"
 	"io"
 	"mime"
 	"net/http"
@@ -31,8 +30,12 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/mholt/archiver/v4"
+	"github.com/schollz/progressbar/v3"
+
+	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
 )
 
 // FileDownloader загружает файлы с использованием HTTP
@@ -51,7 +54,7 @@ func (FileDownloader) MatchURL(string) bool {
 
 // Download загружает файл с использованием HTTP. Если файл
 // сжат в поддерживаемом формате, он будет распакован
-func (FileDownloader) Download(ctx context.Context, opts Options) (Type, string, error) {
+func (FileDownloader) Download(opts Options) (Type, string, error) {
 	// Разбор URL
 	u, err := url.Parse(opts.URL)
 	if err != nil {
@@ -91,12 +94,8 @@ func (FileDownloader) Download(ctx context.Context, opts Options) (Type, string,
 		}
 		r = localFl
 	} else {
-		req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)
-		if err != nil {
-			return 0, "", fmt.Errorf("failed to create request: %w", err)
-		}
 		// Выполнение HTTP GET запроса
-		res, err := http.DefaultClient.Do(req)
+		res, err := http.Get(u.String())
 		if err != nil {
 			return 0, "", err
 		}
@@ -115,13 +114,29 @@ func (FileDownloader) Download(ctx context.Context, opts Options) (Type, string,
 	if err != nil {
 		return 0, "", err
 	}
+	defer fl.Close()
 
-	var out io.WriteCloser
+	var bar io.WriteCloser
 	// Настройка индикатора прогресса
 	if opts.Progress != nil {
-		out = NewProgressWriter(fl, size, name, opts.Progress)
+		bar = progressbar.NewOptions64(
+			size,
+			progressbar.OptionSetDescription(name),
+			progressbar.OptionSetWriter(opts.Progress),
+			progressbar.OptionShowBytes(true),
+			progressbar.OptionSetWidth(10),
+			progressbar.OptionThrottle(65*time.Millisecond),
+			progressbar.OptionShowCount(),
+			progressbar.OptionOnCompletion(func() {
+				_, _ = io.WriteString(opts.Progress, "\n")
+			}),
+			progressbar.OptionSpinnerType(14),
+			progressbar.OptionFullWidth(),
+			progressbar.OptionSetRenderBlankState(true),
+		)
+		defer bar.Close()
 	} else {
-		out = fl
+		bar = handlers.NopRWC{}
 	}
 
 	h, err := opts.NewHash()
@@ -132,9 +147,9 @@ func (FileDownloader) Download(ctx context.Context, opts Options) (Type, string,
 	var w io.Writer
 	// Настройка MultiWriter для записи в файл, хеш и индикатор прогресса
 	if opts.Hash != nil {
-		w = io.MultiWriter(h, out)
+		w = io.MultiWriter(fl, h, bar)
 	} else {
-		w = io.MultiWriter(out)
+		w = io.MultiWriter(fl, bar)
 	}
 
 	// Копирование содержимого из источника в файл назначения
@@ -143,7 +158,6 @@ func (FileDownloader) Download(ctx context.Context, opts Options) (Type, string,
 		return 0, "", err
 	}
 	r.Close()
-	out.Close()
 
 	// Проверка контрольной суммы
 	if opts.Hash != nil {

internal/dl/git.go

@@ -20,7 +20,6 @@
 package dl
 
 import (
-	"context"
 	"errors"
 	"net/url"
 	"path"
@@ -48,7 +47,7 @@ func (GitDownloader) MatchURL(u string) bool {
 // Download uses git to clone the repository from the specified URL.
 // It allows specifying the revision, depth and recursion options
 // via query string
-func (GitDownloader) Download(ctx context.Context, opts Options) (Type, string, error) {
+func (GitDownloader) Download(opts Options) (Type, string, error) {
 	u, err := url.Parse(opts.URL)
 	if err != nil {
 		return 0, "", err
@@ -90,7 +89,7 @@ func (GitDownloader) Download(ctx context.Context, opts Options) (Type, string,
 		co.RecurseSubmodules = git.DefaultSubmoduleRecursionDepth
 	}
 
-	r, err := git.PlainCloneContext(ctx, opts.Destination, false, co)
+	r, err := git.PlainClone(opts.Destination, false, co)
 	if err != nil {
 		return 0, "", err
 	}

internal/dl/progress_tui.go

@@ -1,247 +0,0 @@
-// ALR - Any Linux Repository
-// Copyright (C) 2025 Евгений Храмов
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package dl
-
-import (
-	"fmt"
-	"io"
-	"math"
-	"os"
-	"time"
-
-	"github.com/charmbracelet/bubbles/progress"
-	"github.com/charmbracelet/bubbles/spinner"
-	tea "github.com/charmbracelet/bubbletea"
-	"github.com/leonelquinteros/gotext"
-)
-
-type model struct {
-	progress   progress.Model
-	spinner    spinner.Model
-	percent    float64
-	speed      float64
-	done       bool
-	useSpinner bool
-	filename   string
-
-	total      int64
-	downloaded int64
-	elapsed    time.Duration
-	remaining  time.Duration
-
-	width int
-}
-
-func (m model) Init() tea.Cmd {
-	if m.useSpinner {
-		return m.spinner.Tick
-	}
-	return nil
-}
-
-func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
-	if m.done {
-		return m, tea.Quit
-	}
-
-	switch msg := msg.(type) {
-	case progressUpdate:
-		m.percent = msg.percent
-		m.speed = msg.speed
-		m.downloaded = msg.downloaded
-		m.total = msg.total
-		m.elapsed = time.Duration(msg.elapsed) * time.Second
-		m.remaining = time.Duration(msg.remaining) * time.Second
-		if m.percent >= 1.0 {
-			m.done = true
-			return m, tea.Quit
-		}
-		return m, nil
-	case tea.WindowSizeMsg:
-		m.width = msg.Width
-		return m, nil
-	case progress.FrameMsg:
-		if !m.useSpinner {
-			progressModel, cmd := m.progress.Update(msg)
-			m.progress = progressModel.(progress.Model)
-			return m, cmd
-		}
-	case spinner.TickMsg:
-		if m.useSpinner {
-			spinnerModel, cmd := m.spinner.Update(msg)
-			m.spinner = spinnerModel
-			return m, cmd
-		}
-	case tea.KeyMsg:
-		if msg.String() == "q" {
-			return m, tea.Quit
-		}
-	}
-
-	return m, nil
-}
-
-func (m model) View() string {
-	if m.done {
-		return gotext.Get("%s: done!\n", m.filename)
-	}
-	if m.useSpinner {
-		return gotext.Get(
-			"%s %s downloading at %s/s\n",
-			m.filename,
-			m.spinner.View(),
-			prettyByteSize(int64(m.speed)),
-		)
-	}
-
-	leftPart := m.filename
-
-	rightPart := fmt.Sprintf("%.2f%% (%s/%s, %s/s) [%v:%v]\n", m.percent*100,
-		prettyByteSize(m.downloaded),
-		prettyByteSize(m.total),
-		prettyByteSize(int64(m.speed)),
-		m.elapsed,
-		m.remaining,
-	)
-
-	m.progress.Width = m.width - len(leftPart) - len(rightPart) - 6
-	bar := m.progress.ViewAs(m.percent)
-	return fmt.Sprintf(
-		"%s %s %s",
-		leftPart,
-		bar,
-		rightPart,
-	)
-}
-
-func prettyByteSize(b int64) string {
-	bf := float64(b)
-	for _, unit := range []string{"", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi"} {
-		if math.Abs(bf) < 1024.0 {
-			return fmt.Sprintf("%3.1f%sB", bf, unit)
-		}
-		bf /= 1024.0
-	}
-	return fmt.Sprintf("%.1fYiB", bf)
-}
-
-type progressUpdate struct {
-	percent float64
-	speed   float64
-	total   int64
-
-	downloaded int64
-	elapsed    float64
-	remaining  float64
-}
-
-type ProgressWriter struct {
-	baseWriter   io.WriteCloser
-	total        int64
-	downloaded   int64
-	startTime    time.Time
-	onProgress   func(progressUpdate)
-	lastReported time.Time
-	doneChan     chan struct{}
-}
-
-func (pw *ProgressWriter) Write(p []byte) (int, error) {
-	n, err := pw.baseWriter.Write(p)
-	if err != nil {
-		return n, err
-	}
-
-	pw.downloaded += int64(n)
-	now := time.Now()
-	elapsed := now.Sub(pw.startTime).Seconds()
-	speed := float64(pw.downloaded) / elapsed
-	var remaining, percent float64
-	if pw.total > 0 {
-		remaining = (float64(pw.total) - float64(pw.downloaded)) / speed
-		percent = float64(pw.downloaded) / float64(pw.total)
-	}
-
-	if now.Sub(pw.lastReported) > 100*time.Millisecond {
-		pw.onProgress(progressUpdate{
-			percent:    percent,
-			speed:      speed,
-			total:      pw.total,
-			downloaded: pw.downloaded,
-			elapsed:    elapsed,
-			remaining:  remaining,
-		})
-		pw.lastReported = now
-	}
-
-	return n, nil
-}
-
-func (pw *ProgressWriter) Close() error {
-	pw.onProgress(progressUpdate{
-		percent:    1,
-		speed:      0,
-		downloaded: pw.downloaded,
-	})
-	<-pw.doneChan
-	return nil
-}
-
-func NewProgressWriter(base io.WriteCloser, max int64, filename string, out io.Writer) *ProgressWriter {
-	var m *model
-	if max == -1 {
-		m = &model{
-			spinner:    spinner.New(),
-			useSpinner: true,
-			filename:   filename,
-		}
-		m.spinner.Spinner = spinner.Dot
-	} else {
-		m = &model{
-			progress: progress.New(
-				progress.WithDefaultGradient(),
-				progress.WithoutPercentage(),
-			),
-			useSpinner: false,
-			filename:   filename,
-		}
-	}
-
-	p := tea.NewProgram(m,
-		tea.WithInput(nil),
-		tea.WithOutput(out),
-	)
-
-	pw := &ProgressWriter{
-		baseWriter: base,
-		total:      max,
-		startTime:  time.Now(),
-		doneChan:   make(chan struct{}),
-		onProgress: func(update progressUpdate) {
-			p.Send(update)
-		},
-	}
-
-	go func() {
-		defer close(pw.doneChan)
-		if _, err := p.Run(); err != nil {
-			fmt.Fprintf(os.Stderr, "Error running progress writer: %v\n", err)
-			os.Exit(1)
-		}
-	}()
-
-	return pw
-}

internal/dl/torrent.go

@@ -20,7 +20,6 @@
 package dl
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -50,7 +49,7 @@ func (TorrentDownloader) MatchURL(u string) bool {
 }
 
 // Download downloads a file over the BitTorrent protocol.
-func (TorrentDownloader) Download(ctx context.Context, opts Options) (Type, string, error) {
+func (TorrentDownloader) Download(opts Options) (Type, string, error) {
 	aria2Path, err := exec.LookPath("aria2c")
 	if err != nil {
 		return 0, "", ErrAria2NotFound
@@ -58,7 +57,7 @@ func (TorrentDownloader) Download(ctx context.Context, opts Options) (Type, stri
 
 	opts.URL = strings.TrimPrefix(opts.URL, "torrent+")
 
-	cmd := exec.CommandContext(ctx, aria2Path, "--summary-interval=0", "--log-level=warn", "--seed-time=0", "--dir="+opts.Destination, opts.URL)
+	cmd := exec.Command(aria2Path, "--summary-interval=0", "--log-level=warn", "--seed-time=0", "--dir="+opts.Destination, opts.URL)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err = cmd.Run()

internal/overrides/overrides.go

@@ -20,9 +20,7 @@
 package overrides
 
 import (
-	"fmt"
 	"reflect"
-	"regexp"
 	"strings"
 
 	"golang.org/x/exp/slices"
@@ -225,19 +223,3 @@ func parseLangs(langs []string, tags []language.Tag) ([]string, error) {
 	out = slices.Compact(out)
 	return out, nil
 }
-
-func ReleasePlatformSpecific(release int, info *distro.OSRelease) string {
-	if info.ID == "altlinux" {
-		return fmt.Sprintf("alt%d", release)
-	}
-
-	if info.ID == "fedora" || slices.Contains(info.Like, "fedora") {
-		re := regexp.MustCompile(`platform:(\S+)`)
-		match := re.FindStringSubmatch(info.PlatformID)
-		if len(match) > 1 {
-			return fmt.Sprintf("%d.%s", release, match[1])
-		}
-	}
-
-	return fmt.Sprintf("%d", release)
-}

internal/overrides/overrides_test.go

@@ -24,7 +24,6 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	"golang.org/x/text/language"
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
@@ -196,42 +195,3 @@ func TestResolveLangs(t *testing.T) {
 		t.Errorf("expected %v, got %v", expected, names)
 	}
 }
-
-func TestReleasePlatformSpecific(t *testing.T) {
-	type testCase struct {
-		info     *distro.OSRelease
-		expected string
-	}
-
-	for _, tc := range []testCase{
-		{
-			info: &distro.OSRelease{
-				ID:         "centos",
-				Like:       []string{"rhel", "fedora"},
-				PlatformID: "platform:el8",
-			},
-			expected: "1.el8",
-		},
-		{
-			info: &distro.OSRelease{
-				ID:         "fedora",
-				PlatformID: "platform:f42",
-			},
-			expected: "1.f42",
-		},
-		{
-			info: &distro.OSRelease{
-				ID: "altlinux",
-			},
-			expected: "alt1",
-		},
-		{
-			info: &distro.OSRelease{
-				ID: "ubuntu",
-			},
-			expected: "1",
-		},
-	} {
-		assert.Equal(t, tc.expected, overrides.ReleasePlatformSpecific(1, tc.info))
-	}
-}

internal/translations/default.pot

@@ -26,23 +26,23 @@ msgid ""
 "Build package from scratch even if there's an already built package available"
 msgstr ""
 
-#: build.go:80
+#: build.go:71
 msgid "Error pulling repositories"
 msgstr ""
 
-#: build.go:87
+#: build.go:78
 msgid "Unable to detect a supported package manager on the system"
 msgstr ""
 
-#: build.go:98
+#: build.go:89
 msgid "Error building package"
 msgstr ""
 
-#: build.go:104
+#: build.go:95
 msgid "Error getting working directory"
 msgstr ""
 
-#: build.go:112
+#: build.go:103
 msgid "Error moving the package"
 msgstr ""
 
@@ -251,14 +251,6 @@ msgstr ""
 msgid "Downloading source"
 msgstr ""
 
-#: internal/dl/progress_tui.go:100
-msgid "%s: done!\n"
-msgstr ""
-
-#: internal/dl/progress_tui.go:104
-msgid "%s %s downloading at %s/s\n"
-msgstr ""
-
 #: internal/logger/log.go:47
 msgid "ERROR"
 msgstr ""
@@ -293,81 +285,81 @@ msgstr ""
 msgid "Error while running app"
 msgstr ""
 
-#: pkg/build/build.go:107
+#: pkg/build/build.go:104
 msgid "Failed to prompt user to view build script"
 msgstr ""
 
-#: pkg/build/build.go:111
+#: pkg/build/build.go:108
 msgid "Building package"
 msgstr ""
 
-#: pkg/build/build.go:155
+#: pkg/build/build.go:152
 msgid "Downloading sources"
 msgstr ""
 
-#: pkg/build/build.go:167
+#: pkg/build/build.go:164
 msgid "Building package metadata"
 msgstr ""
 
-#: pkg/build/build.go:189
+#: pkg/build/build.go:186
 msgid "Compressing package"
 msgstr ""
 
-#: pkg/build/build.go:315
+#: 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:326
+#: pkg/build/build.go:323
 msgid "This package is already installed"
 msgstr ""
 
-#: pkg/build/build.go:354
+#: pkg/build/build.go:351
 msgid "Installing build dependencies"
 msgstr ""
 
-#: pkg/build/build.go:396
+#: pkg/build/build.go:393
 msgid "Installing dependencies"
 msgstr ""
 
-#: pkg/build/build.go:442
+#: pkg/build/build.go:439
 msgid "Executing version()"
 msgstr ""
 
-#: pkg/build/build.go:462
+#: pkg/build/build.go:459
 msgid "Updating version"
 msgstr ""
 
-#: pkg/build/build.go:467
+#: pkg/build/build.go:464
 msgid "Executing prepare()"
 msgstr ""
 
-#: pkg/build/build.go:477
+#: pkg/build/build.go:474
 msgid "Executing build()"
 msgstr ""
 
-#: pkg/build/build.go:489
+#: pkg/build/build.go:486
 msgid "Executing package()"
 msgstr ""
 
-#: pkg/build/build.go:527
+#: pkg/build/build.go:524
 msgid "Executing files()"
 msgstr ""
 
-#: pkg/build/build.go:605
+#: pkg/build/build.go:601
-msgid "AutoProv is not implemented for this package format, so it's skipped"
+msgid "AutoProv is not implemented for this package format, so it's skiped"
 msgstr ""
 
-#: pkg/build/build.go:616
+#: pkg/build/build.go:612
-msgid "AutoReq is not implemented for this package format, so it's skipped"
+msgid "AutoReq is not implemented for this package format, so it's skiped"
 msgstr ""
 
-#: pkg/build/build.go:723
+#: pkg/build/build.go:719
 msgid "Would you like to remove the build dependencies?"
 msgstr ""
 
-#: pkg/build/build.go:829
+#: pkg/build/build.go:825
 msgid "The checksums array must be the same length as sources"
 msgstr ""
 
@@ -405,7 +397,7 @@ msgstr ""
 
 #: pkg/repos/pull.go:172
 msgid ""
-"ALR repo's minimum ALR version is greater than the current version. Try "
+"ALR repo's minumum ALR version is greater than the current version. Try "
 "updating ALR if something doesn't work."
 msgstr ""
 
@@ -453,14 +445,14 @@ msgstr ""
 msgid "Pull all repositories that have changed"
 msgstr ""
 
-#: upgrade.go:47
+#: upgrade.go:46
 msgid "Upgrade all installed packages"
 msgstr ""
 
-#: upgrade.go:83
+#: upgrade.go:82
 msgid "Error checking for updates"
 msgstr ""
 
-#: upgrade.go:94
+#: upgrade.go:93
 msgid "There is nothing to do."
 msgstr ""

internal/translations/po/ru/default.po

@@ -1,12 +1,11 @@
 #
 # Maxim Slipenko <maks1ms@alt-gnome.ru>, 2025.
-# x1z53 <x1z53@yandex.ru>, 2025.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: unnamed project\n"
-"PO-Revision-Date: 2025-01-24 21:20+0300\n"
+"PO-Revision-Date: 2025-01-22 16:50+0300\n"
-"Last-Translator: x1z53 <x1z53@yandex.ru>\n"
+"Last-Translator: Maxim Slipenko <maks1ms@alt-gnome.ru>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -17,153 +16,155 @@ msgstr ""
 "X-Generator: Gtranslator 47.1\n"
 
 #: build.go:41
+#, fuzzy
 msgid "Build a local package"
-msgstr "Сборка локального пакета"
+msgstr "Сборка пакета"
 
 #: build.go:47
+#, fuzzy
 msgid "Path to the build script"
-msgstr "Путь к скрипту сборки"
+msgstr "Не удалось предложить просмотреть скрипт"
 
 #: build.go:52
 msgid "Name of the package to build and its repo (example: default/go-bin)"
-msgstr "Имя пакета для сборки и его репозиторий (пример: default/go-bin)"
+msgstr ""
 
 #: build.go:57
 msgid ""
 "Build package from scratch even if there's an already built package available"
-msgstr "Создайте пакет с нуля, даже если уже имеется готовый пакет"
+msgstr ""
 
-#: build.go:80
+#: build.go:71
 msgid "Error pulling repositories"
-msgstr "Ошибка при извлечении репозиториев"
+msgstr ""
 
-#: build.go:87
+#: build.go:78
 msgid "Unable to detect a supported package manager on the system"
-msgstr "Не удалось обнаружить поддерживаемый менеджер пакетов в системе"
+msgstr ""
 
-#: build.go:98
+#: build.go:89
 msgid "Error building package"
 msgstr "Ошибка при сборке пакета"
 
-#: build.go:104
+#: build.go:95
 msgid "Error getting working directory"
-msgstr "Ошибка при получении рабочего каталога"
+msgstr ""
 
-#: build.go:112
+#: build.go:103
 msgid "Error moving the package"
-msgstr "Ошибка при перемещении пакета"
+msgstr ""
 
 #: fix.go:37
 msgid "Attempt to fix problems with ALR"
-msgstr "Попытка устранить проблемы с ALR"
+msgstr ""
 
 #: fix.go:44
 msgid "Removing cache directory"
-msgstr "Удаление каталога кэша"
+msgstr ""
 
 #: fix.go:48
 msgid "Unable to remove cache directory"
-msgstr "Не удалось удалить каталог кэша"
+msgstr ""
 
 #: fix.go:52
 msgid "Rebuilding cache"
-msgstr "Восстановление кэша"
+msgstr ""
 
 #: fix.go:56
 msgid "Unable to create new cache directory"
-msgstr "Не удалось создать новый каталог кэша"
+msgstr ""
 
 #: fix.go:62
 msgid "Error pulling repos"
-msgstr "Ошибка при извлечении репозиториев"
+msgstr ""
 
 #: fix.go:66
 msgid "Done"
-msgstr "Сделано"
+msgstr ""
 
 #: gen.go:34
 msgid "Generate a ALR script from a template"
-msgstr "Генерация скрипта ALR из шаблона"
+msgstr ""
 
 #: gen.go:39
 msgid "Generate a ALR script for a pip module"
-msgstr "Генерация скрипта ALR для модуля pip"
+msgstr ""
 
 #: helper.go:41
 msgid "List all the available helper commands"
-msgstr "Список всех доступных вспомогательных команды"
+msgstr ""
 
 #: helper.go:53
 msgid "Run a ALR helper command"
-msgstr "Запустить вспомогательную команду ALR"
+msgstr ""
 
 #: helper.go:60
 msgid "The directory that the install commands will install to"
-msgstr "Каталог, в который будут устанавливать команды установки"
+msgstr ""
 
 #: helper.go:73
 msgid "No such helper command"
-msgstr "Такой вспомогательной команды нет"
+msgstr ""
 
 #: info.go:42
 msgid "Print information about a package"
-msgstr "Отобразить информацию о пакете"
+msgstr "Напечатать информацию о пакете"
 
 #: info.go:47
 msgid "Show all information, not just for the current distro"
-msgstr "Показывать всю информацию, не только для текущего дистрибутива"
+msgstr "Показывать всю информацию, а не только для текущего дистрибутива"
 
 #: info.go:57
 msgid "Error initialization database"
-msgstr "Ошибка инициализации базы данных"
+msgstr ""
 
 #: info.go:64
 msgid "Command info expected at least 1 argument, got %d"
-msgstr "Для команды info ожидался хотя бы 1 аргумент, получено %d"
+msgstr ""
 
 #: info.go:78
 msgid "Error finding packages"
-msgstr "Ошибка при поиске пакетов"
+msgstr ""
 
 #: info.go:94
 msgid "Error parsing os-release file"
-msgstr "Ошибка при разборе файла выпуска операционной системы"
+msgstr ""
 
 #: info.go:103
 msgid "Error resolving overrides"
-msgstr "Ошибка устранения переорпеделений"
+msgstr ""
 
 #: info.go:112 info.go:118
 msgid "Error encoding script variables"
-msgstr "Ошибка кодирования переменных скрита"
+msgstr ""
 
 #: install.go:42
 msgid "Install a new package"
-msgstr "Установить новый пакет"
+msgstr ""
 
 #: install.go:56
 msgid "Command install expected at least 1 argument, got %d"
-msgstr "Для команды install ожидался хотя бы 1 аргумент, получено %d"
+msgstr ""
 
 #: install.go:91
 msgid "Error getting packages"
-msgstr "Ошибка при получении пакетов"
+msgstr ""
 
 #: install.go:100
 msgid "Error iterating over packages"
-msgstr "Ошибка при переборе пакетов"
+msgstr ""
 
 #: install.go:113
 msgid "Remove an installed package"
-msgstr "Удалить установленный пакет"
+msgstr ""
 
 #: install.go:118
 msgid "Command remove expected at least 1 argument, got %d"
-msgstr "Для команды remove ожидался хотя бы 1 аргумент, получено %d"
+msgstr ""
 
 #: install.go:130
 msgid "Error removing packages"
-msgstr "Ошибка при удалении пакетов"
+msgstr ""
 
 #: internal/cliutils/prompt.go:60
 msgid "Would you like to view the build script for %s"
@@ -179,235 +180,216 @@ msgstr "Пользователь решил не продолжать после
 
 #: internal/cliutils/prompt.go:111
 msgid "Error prompting for choice of package"
-msgstr "Ошибка при запросе выбора пакета"
+msgstr ""
 
 #: internal/cliutils/prompt.go:135
 msgid "Choose which package to %s"
-msgstr "Выберите, какой пакет использовать для %s"
+msgstr ""
 
 #: internal/cliutils/prompt.go:156
 msgid "Choose which optional package(s) to install"
-msgstr "Выберите, какой дополнительный пакет(ы) следует установить"
+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 "Не удалось обнаружить каталог конфигурации пользователя"
+msgstr ""
 
 #: internal/config/config.go:97
 msgid "Unable to create ALR config directory"
-msgstr "Не удалось создать каталог конфигурации ALR"
+msgstr ""
 
 #: internal/config/config.go:106
 msgid "Unable to create ALR config file"
-msgstr "Не удалось создать конфигурационный файл ALR"
+msgstr ""
 
 #: internal/config/config.go:112
 msgid "Error encoding default configuration"
-msgstr "Ошибка кодирования конфигурации по умолчанию"
+msgstr ""
 
 #: internal/config/config.go:121
 msgid "Unable to detect cache directory"
-msgstr "Не удалось обнаружить каталог кэша"
+msgstr ""
 
 #: internal/config/config.go:131
 msgid "Unable to create repo cache directory"
-msgstr "Не удалось создать каталог кэша репозитория"
+msgstr ""
 
 #: internal/config/config.go:137
 msgid "Unable to create package cache directory"
-msgstr "Не удалось создать каталог кэша пакетов"
+msgstr ""
 
 #: internal/config/lang.go:50
 msgid "Error parsing system language"
-msgstr "Ошибка при парсинге языка системы"
+msgstr ""
 
 #: internal/db/db.go:131
 msgid "Database version mismatch; resetting"
-msgstr "Несоответствие версий базы данных; сброс настроек"
+msgstr ""
 
 #: internal/db/db.go:135
 msgid ""
 "Database version does not exist. Run alr fix if something isn't working."
 msgstr ""
-"Версия базы данных не существует. Запустите alr fix, если что-то не работает."
 
 #: internal/db/db_legacy.go:101
 msgid "Error opening database"
-msgstr "Ошибка при открытии базы данных"
+msgstr ""
 
 #: internal/dl/dl.go:170
 msgid "Source can be updated, updating if required"
-msgstr "Исходный код можно обновлять, обновляя при необходимости"
+msgstr ""
 
 #: internal/dl/dl.go:201
 msgid "Source found in cache and linked to destination"
-msgstr "Источник найден в кэше и связан с пунктом назначения"
+msgstr ""
 
 #: internal/dl/dl.go:208
 msgid "Source updated and linked to destination"
-msgstr "Источник обновлён и связан с пунктом назначения"
+msgstr ""
 
 #: internal/dl/dl.go:222
 msgid "Downloading source"
 msgstr "Скачивание источника"
 
-#: internal/dl/progress_tui.go:100
-msgid "%s: done!\n"
-msgstr ""
-
-#: internal/dl/progress_tui.go:104
-msgid "%s %s downloading at %s/s\n"
-msgstr ""
-
 #: internal/logger/log.go:47
 msgid "ERROR"
 msgstr "ОШИБКА"
 
 #: list.go:40
 msgid "List ALR repo packages"
-msgstr "Список пакетов репозитория ALR"
+msgstr ""
 
 #: list.go:91
 msgid "Error listing installed packages"
-msgstr "Ошибка при составлении списка установленных пакетов"
+msgstr ""
 
 #: main.go:45
 msgid "Print the current ALR version and exit"
-msgstr "Показать текущую версию ALR и выйти"
+msgstr ""
 
 #: main.go:61
 msgid "Arguments to be passed on to the package manager"
-msgstr "Аргументы, которые будут переданы менеджеру пакетов"
+msgstr ""
 
 #: main.go:67
 msgid "Enable interactive questions and prompts"
-msgstr "Включение интерактивных вопросов и запросов"
+msgstr ""
 
 #: main.go:90
 msgid ""
 "Running ALR as root is forbidden as it may cause catastrophic damage to your "
 "system"
 msgstr ""
-"Запуск ALR от имени root запрещён, так как это может привести к "
-"катастрофическому повреждению вашей системы"
 
 #: main.go:124
 msgid "Error while running app"
-msgstr "Ошибка при запуске приложения"
+msgstr ""
 
-#: pkg/build/build.go:107
+#: pkg/build/build.go:104
 msgid "Failed to prompt user to view build script"
-msgstr "Не удалось предложить пользователю просмотреть скрипт сборки"
+msgstr "Не удалось предложить просмотреть скрипт"
 
-#: pkg/build/build.go:111
+#: pkg/build/build.go:108
 msgid "Building package"
 msgstr "Сборка пакета"
 
-#: pkg/build/build.go:155
+#: pkg/build/build.go:152
 msgid "Downloading sources"
-msgstr "Скачивание источников"
+msgstr "Скачивание файлов"
 
-#: pkg/build/build.go:167
+#: pkg/build/build.go:164
 msgid "Building package metadata"
-msgstr "Сборка метаданных пакета"
+msgstr ""
 
-#: pkg/build/build.go:189
+#: pkg/build/build.go:186
 msgid "Compressing package"
-msgstr "Сжатие пакета"
+msgstr ""
 
-#: pkg/build/build.go:315
+#: 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:326
+#: pkg/build/build.go:323
 msgid "This package is already installed"
-msgstr "Этот пакет уже установлен"
+msgstr ""
 
-#: pkg/build/build.go:354
+#: pkg/build/build.go:351
 msgid "Installing build dependencies"
-msgstr "Установка зависимостей сборки"
+msgstr ""
 
-#: pkg/build/build.go:396
+#: pkg/build/build.go:393
 msgid "Installing dependencies"
-msgstr "Установка зависимостей"
+msgstr ""
 
-#: pkg/build/build.go:442
+#: pkg/build/build.go:439
 msgid "Executing version()"
-msgstr "Исполнение версия()"
+msgstr ""
 
-#: pkg/build/build.go:462
+#: pkg/build/build.go:459
 msgid "Updating version"
-msgstr "Обновление версии"
+msgstr ""
 
-#: pkg/build/build.go:467
+#: pkg/build/build.go:464
 msgid "Executing prepare()"
-msgstr "Исполнение prepare()"
+msgstr ""
 
-#: pkg/build/build.go:477
+#: pkg/build/build.go:474
 msgid "Executing build()"
-msgstr "Исполнение build()"
+msgstr ""
 
-#: pkg/build/build.go:489
+#: pkg/build/build.go:486
 msgid "Executing package()"
-msgstr "Исполнение package()"
+msgstr ""
 
-#: pkg/build/build.go:527
+#: pkg/build/build.go:524
 msgid "Executing files()"
-msgstr "Исполнение files()"
-
-#: pkg/build/build.go:605
-msgid "AutoProv is not implemented for this package format, so it's skipped"
 msgstr ""
-"AutoProv не реализовано для этого формата пакета, поэтому будет пропущено"
 
-#: pkg/build/build.go:616
+#: pkg/build/build.go:601
-msgid "AutoReq is not implemented for this package format, so it's skipped"
+msgid "AutoProv is not implemented for this package format, so it's skiped"
 msgstr ""
-"AutoReq не реализовано для этого формата пакета, поэтому будет пропущено"
 
-#: pkg/build/build.go:723
+#: pkg/build/build.go:612
+msgid "AutoReq is not implemented for this package format, so it's skiped"
+msgstr ""
+
+#: pkg/build/build.go:719
 msgid "Would you like to remove the build dependencies?"
-msgstr "Хотели бы вы удалить зависимости сборки?"
+msgstr ""
 
-#: pkg/build/build.go:829
+#: pkg/build/build.go:825
 msgid "The checksums array must be the same length as sources"
-msgstr "Массив контрольных сумм должен быть той же длины, что и источники"
+msgstr ""
 
 #: pkg/build/findDeps.go:35
 msgid "Command not found on the system"
-msgstr "Команда не найдена в системе"
+msgstr ""
 
 #: pkg/build/findDeps.go:82
 msgid "Provided dependency found"
-msgstr "Найденная предоставленная зависимость"
+msgstr ""
 
 #: pkg/build/findDeps.go:89
 msgid "Required dependency found"
-msgstr "Найдена требуемая зависимость"
+msgstr ""
 
 #: pkg/build/install.go:42
 msgid "Error installing native packages"
-msgstr "Ошибка при установке нативных пакетов"
+msgstr ""
 
 #: pkg/build/install.go:79
 msgid "Error installing package"
-msgstr "Ошибка при установке пакета"
+msgstr ""
 
 #: pkg/repos/pull.go:75
 msgid "Pulling repository"
@@ -415,72 +397,71 @@ msgstr "Скачивание репозитория"
 
 #: pkg/repos/pull.go:99
 msgid "Repository up to date"
-msgstr "Репозиторий уже обновлён"
+msgstr "Репозиторий уже обновлен"
 
 #: pkg/repos/pull.go:156
 msgid "Git repository does not appear to be a valid ALR repo"
-msgstr "Репозиторий Git не поддерживается репозиторием ALR"
+msgstr ""
 
 #: pkg/repos/pull.go:172
 msgid ""
-"ALR repo's minimum ALR version is greater than the current version. Try "
+"ALR repo's minumum ALR version is greater than the current version. Try "
 "updating ALR if something doesn't work."
 msgstr ""
-"Минимальная версия ALR для ALR-репозитория выше текущей версии. Попробуйте "
-"обновить ALR, если что-то не работает."
 
 #: repo.go:41
+#, fuzzy
 msgid "Add a new repository"
-msgstr "Добавить новый репозиторий"
+msgstr "Скачивание репозитория"
 
 #: repo.go:48
 msgid "Name of the new repo"
-msgstr "Название нового репозитория"
+msgstr ""
 
 #: repo.go:54
 msgid "URL of the new repo"
-msgstr "URL-адрес нового репозитория"
+msgstr ""
 
 #: repo.go:79 repo.go:136
 msgid "Error opening config file"
-msgstr "Ошибка при открытии конфигурационного файла"
+msgstr ""
 
 #: repo.go:85 repo.go:142
 msgid "Error encoding config"
-msgstr "Ошибка при кодировании конфигурации"
+msgstr ""
 
 #: repo.go:103
 msgid "Remove an existing repository"
-msgstr "Удалить существующий репозиторий"
+msgstr ""
 
 #: repo.go:110
 msgid "Name of the repo to be deleted"
-msgstr "Название репозитория  удалён"
+msgstr ""
 
 #: repo.go:128
 msgid "Repo does not exist"
-msgstr "Репозитория не существует"
+msgstr ""
 
 #: repo.go:148
 msgid "Error removing repo directory"
-msgstr "Ошибка при удалении каталога репозитория"
+msgstr ""
 
 #: repo.go:154
 msgid "Error removing packages from database"
-msgstr "Ошибка при удалении пакетов из базы данных"
+msgstr ""
 
 #: repo.go:166
 msgid "Pull all repositories that have changed"
-msgstr "Скачать все изменённые репозитории"
+msgstr ""
 
-#: upgrade.go:47
+#: upgrade.go:46
 msgid "Upgrade all installed packages"
-msgstr "Обновить все установленные пакеты"
+msgstr ""
 
-#: upgrade.go:83
+#: upgrade.go:82
 msgid "Error checking for updates"
-msgstr "Ошибка при проверке обновлений"
+msgstr ""
 
-#: upgrade.go:94
+#: upgrade.go:93
 msgid "There is nothing to do."
-msgstr "Здесь нечего делать."
+msgstr ""

pkg/build/build.go

@@ -35,8 +35,6 @@ import (
 	"time"
 
 	// Импортируем пакеты для поддержки различных форматов пакетов (APK, DEB, RPM и ARCH).
-
-	"github.com/google/shlex"
 	_ "github.com/goreleaser/nfpm/v2/apk"
 	_ "github.com/goreleaser/nfpm/v2/arch"
 	_ "github.com/goreleaser/nfpm/v2/deb"
@@ -54,7 +52,6 @@ import (
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/cpu"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/dl"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/decoder"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/handlers"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/shutils/helpers"
@@ -537,10 +534,7 @@ func executeFunctions(ctx context.Context, dec *decoder.Decoder, dirs types.Dire
 			return nil, err
 		}
 
-		contents, err := shlex.Split(buf.String())
+		contents := strings.Fields(strings.TrimSpace(buf.String()))
-		if err != nil {
-			return nil, err
-		}
 		output.Contents = &contents
 	}
 
@@ -577,7 +571,9 @@ func buildPkgMetadata(
 		})
 	}
 
-	pkgInfo.Release = overrides.ReleasePlatformSpecific(vars.Release, info)
+	if pkgFormat == "rpm" && info.ID == "altlinux" {
+		pkgInfo.Release = "alt" + pkgInfo.Release
+	}
 
 	if vars.Epoch != 0 {
 		pkgInfo.Epoch = strconv.FormatUint(uint64(vars.Epoch), 10)
@@ -602,7 +598,7 @@ func buildPkgMetadata(
 				return nil, err
 			}
 		} else {
-			slog.Info(gotext.Get("AutoProv is not implemented for this package format, so it's skipped"))
+			slog.Info(gotext.Get("AutoProv is not implemented for this package format, so it's skiped"))
 		}
 	}
 
@@ -613,7 +609,7 @@ func buildPkgMetadata(
 				return nil, err
 			}
 		} else {
-			slog.Info(gotext.Get("AutoReq is not implemented for this package format, so it's skipped"))
+			slog.Info(gotext.Get("AutoReq is not implemented for this package format, so it's skiped"))
 		}
 	}
 

pkg/distro/osrelease.go

@@ -44,7 +44,6 @@ type OSRelease struct {
 	SupportURL       string
 	BugReportURL     string
 	Logo             string
-	PlatformID       string
 }
 
 var parsed *OSRelease
@@ -103,7 +102,6 @@ func ParseOSRelease(ctx context.Context) (*OSRelease, error) {
 		SupportURL:       runner.Vars["SUPPORT_URL"].Str,
 		BugReportURL:     runner.Vars["BUG_REPORT_URL"].Str,
 		Logo:             runner.Vars["LOGO"].Str,
-		PlatformID:       runner.Vars["PLATFORM_ID"].Str,
 	}
 
 	distroUpdated := false

pkg/repos/pull.go

@@ -169,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".
 		if strings.HasPrefix(config.Version, "v") {
 			if vercmp.Compare(config.Version, repoCfg.Repo.MinVersion) == -1 {
-				slog.Warn(gotext.Get("ALR repo's minimum ALR version is greater than the current version. Try updating ALR if something doesn't work."), "repo", repo.Name)
+				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)
 			}
 		}
 	}

upgrade.go

@@ -33,7 +33,6 @@ import (
 
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/config"
 	"gitea.plemya-x.ru/Plemya-x/ALR/internal/db"
-	"gitea.plemya-x.ru/Plemya-x/ALR/internal/overrides"
 	"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/distro"
@@ -128,12 +127,10 @@ func checkForUpdates(ctx context.Context, mgr manager.Manager, info *distro.OSRe
 		pkg := pkgs[0]
 
 		repoVer := pkg.Version
-		releaseStr := overrides.ReleasePlatformSpecific(pkg.Release, info)
-
 		if pkg.Release != 0 && pkg.Epoch == 0 {
-			repoVer = fmt.Sprintf("%s-%s", pkg.Version, releaseStr)
+			repoVer = fmt.Sprintf("%s-%d", pkg.Version, pkg.Release)
 		} else if pkg.Release != 0 && pkg.Epoch != 0 {
-			repoVer = fmt.Sprintf("%d:%s-%s", pkg.Epoch, pkg.Version, releaseStr)
+			repoVer = fmt.Sprintf("%d:%s-%d", pkg.Epoch, pkg.Version, pkg.Release)
 		}
 
 		c := vercmp.Compare(repoVer, installed[pkgName])