From 39231f902d2bc70f4c7f6d3a681b44194a958aa2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 02:58:05 +0000 Subject: [PATCH 01/31] Bump golang.org/x/crypto from 0.13.0 to 0.14.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.13.0 to 0.14.0. - [Commits](https://github.com/golang/crypto/compare/v0.13.0...v0.14.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 53cb63f9..7d131f16 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/mattn/go-sqlite3 v1.14.17 github.com/sassoftware/go-rpmutils v0.2.0 github.com/ulikunitz/xz v0.5.11 - golang.org/x/crypto v0.13.0 + golang.org/x/crypto v0.14.0 ) require ( @@ -23,5 +23,5 @@ require ( github.com/kr/text v0.2.0 // indirect github.com/rogpeppe/go-internal v1.10.0 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect - golang.org/x/sys v0.12.0 // indirect + golang.org/x/sys v0.13.0 // indirect ) diff --git a/go.sum b/go.sum index b1032349..70de5d1c 100644 --- a/go.sum +++ b/go.sum @@ -55,8 +55,8 @@ golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= 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.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -82,8 +82,8 @@ 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.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= 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= From a648191b86062b2c2aacee952e20cc955957c541 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Mon, 9 Oct 2023 15:44:54 +0300 Subject: [PATCH 02/31] Add '-pi'/'--postpone-index' option to postpone index rebuild after some commands --- cli/cli.go | 87 +++++++++++++++++++++++--------------------- cli/cmd_add.go | 2 +- cli/cmd_release.go | 2 +- cli/cmd_remove.go | 2 +- cli/cmd_unrelease.go | 2 +- common/rep.spec | 6 ++- 6 files changed, 54 insertions(+), 47 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index 71c9f68d..28464da6 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -44,7 +44,7 @@ import ( // App info const ( APP = "rep" - VER = "3.2.0" + VER = "3.3.0" DESC = "DNF/YUM repository management utility" ) @@ -144,22 +144,23 @@ const ( // Options const ( - OPT_TESTING = "t:testing" - OPT_RELEASE = "r:release" - OPT_ALL = "a:all" - OPT_ARCH = "aa:arch" - OPT_MOVE = "m:move" - OPT_NO_SOURCE = "ns:no-source" - OPT_IGNORE_FILTER = "if:ignore-filter" - OPT_FORCE = "f:force" - OPT_FULL = "F:full" - OPT_SHOW_ALL = "A:show-all" - OPT_EPOCH = "E:epoch" - OPT_STATUS = "S:status" - OPT_PAGER = "P:pager" - OPT_NO_COLOR = "nc:no-color" - OPT_HELP = "h:help" - OPT_VER = "v:version" + OPT_TESTING = "t:testing" + OPT_RELEASE = "r:release" + OPT_ALL = "a:all" + OPT_ARCH = "aa:arch" + OPT_MOVE = "m:move" + OPT_NO_SOURCE = "ns:no-source" + OPT_IGNORE_FILTER = "if:ignore-filter" + OPT_POSTPONE_INDEX = "pi:postpone-index" + OPT_FORCE = "f:force" + OPT_FULL = "F:full" + OPT_SHOW_ALL = "A:show-all" + OPT_EPOCH = "E:epoch" + OPT_STATUS = "S:status" + OPT_PAGER = "P:pager" + OPT_NO_COLOR = "nc:no-color" + OPT_HELP = "h:help" + OPT_VER = "v:version" OPT_DEBUG = "D:debug" OPT_VERB_VER = "vv:verbose-version" @@ -180,22 +181,23 @@ const CONFIG_DIR = "/etc/rep.d" // optMap is map with supported options var optMap = options.Map{ - OPT_ARCH: {}, - OPT_TESTING: {Type: options.BOOL}, - OPT_RELEASE: {Type: options.BOOL}, - OPT_ALL: {Type: options.BOOL}, - OPT_MOVE: {Type: options.BOOL}, - OPT_NO_SOURCE: {Type: options.BOOL}, - OPT_IGNORE_FILTER: {Type: options.BOOL}, - OPT_FORCE: {Type: options.BOOL}, - OPT_FULL: {Type: options.BOOL}, - OPT_SHOW_ALL: {Type: options.BOOL}, - OPT_EPOCH: {Type: options.BOOL}, - OPT_STATUS: {Type: options.BOOL}, - OPT_PAGER: {Type: options.BOOL}, - OPT_NO_COLOR: {Type: options.BOOL}, - OPT_HELP: {Type: options.BOOL}, - OPT_VER: {Type: options.MIXED}, + OPT_ARCH: {}, + OPT_TESTING: {Type: options.BOOL}, + OPT_RELEASE: {Type: options.BOOL}, + OPT_ALL: {Type: options.BOOL}, + OPT_MOVE: {Type: options.BOOL}, + OPT_NO_SOURCE: {Type: options.BOOL}, + OPT_IGNORE_FILTER: {Type: options.BOOL}, + OPT_POSTPONE_INDEX: {Type: options.BOOL}, + OPT_FORCE: {Type: options.BOOL}, + OPT_FULL: {Type: options.BOOL}, + OPT_SHOW_ALL: {Type: options.BOOL}, + OPT_EPOCH: {Type: options.BOOL}, + OPT_STATUS: {Type: options.BOOL}, + OPT_PAGER: {Type: options.BOOL}, + OPT_NO_COLOR: {Type: options.BOOL}, + OPT_HELP: {Type: options.BOOL}, + OPT_VER: {Type: options.MIXED}, OPT_DEBUG: {Type: options.BOOL}, OPT_VERB_VER: {Type: options.BOOL}, @@ -618,16 +620,17 @@ func genUsage() *usage.Info { info.AddOption(OPT_RELEASE, "Run command only on release {s}(stable){!} repository") info.AddOption(OPT_TESTING, "Run command only on testing {s}(unstable){!} repository") info.AddOption(OPT_ALL, "Run command on all repositories") - info.AddOption(OPT_ARCH, "Package architecture {s-}(helpful with \"info\" and \"payload\" commands){!}", "arch") - info.AddOption(OPT_MOVE, "Move {s}(remove after successful action){!} packages {s-}(helpful with \"add\" command){!}") - info.AddOption(OPT_NO_SOURCE, "Ignore source packages {s-}(helpful with \"add\" command){!}") - info.AddOption(OPT_IGNORE_FILTER, "Ignore repository file filter {s-}(helpful with \"add\" and \"sign\" commands){!}") - info.AddOption(OPT_FORCE, "Answer \"yes\" for all questions") - info.AddOption(OPT_FULL, "Full reindex {s-}(helpful with \"reindex\" command){!}") - info.AddOption(OPT_SHOW_ALL, "Show all versions of packages {s-}(helpful with \"list\" command){!}") + info.AddOption(OPT_ARCH, `Package architecture {s-}(helpful with "info" and "payload" commands){!}`, "arch") + info.AddOption(OPT_MOVE, `Move {s}(remove after successful action){!} packages {s-}(helpful with "add" command){!}`) + info.AddOption(OPT_NO_SOURCE, `Ignore source packages {s-}(helpful with "add" command){!}`) + info.AddOption(OPT_IGNORE_FILTER, `Ignore repository file filter {s-}(helpful with "add" and "sign" commands){!}`) + info.AddOption(OPT_POSTPONE_INDEX, `Postpone repository reindex {s-}(helpful with "add", "remove", "release", and "unrelase" commands){!}`) + info.AddOption(OPT_FORCE, `Answer "yes" for all questions`) + info.AddOption(OPT_FULL, `Full reindex {s-}(helpful with "reindex" command){!}`) + info.AddOption(OPT_SHOW_ALL, `Show all versions of packages {s-}(helpful with "list" command){!}`) info.AddOption(OPT_STATUS, "Show package status {s-}(released or not){!}") - info.AddOption(OPT_EPOCH, "Show epoch info {s-}(helpful with \"list\" and \"which-source\" commands){!}") - info.AddOption(OPT_PAGER, "Run command in \"pager\" mode {s-}(i.e. don't disable colors and don't show raw output){!}") + info.AddOption(OPT_EPOCH, `Show epoch info {s-}(helpful with "list" and "which-source" commands){!}`) + info.AddOption(OPT_PAGER, `Run command in "pager" mode {s-}(i.e. don't disable colors and don't show raw output){!}`) info.AddOption(OPT_NO_COLOR, "Disable colors in output") info.AddOption(OPT_HELP, "Show this help message") info.AddOption(OPT_VER, "Show version") diff --git a/cli/cmd_add.go b/cli/cmd_add.go index 4957f8e3..9f3dfff9 100644 --- a/cli/cmd_add.go +++ b/cli/cmd_add.go @@ -103,7 +103,7 @@ func addRPMFiles(ctx *context, files []string, signingKey *sign.Key) bool { hasAdded = true } - if hasAdded { + if hasAdded && !options.GetB(OPT_POSTPONE_INDEX) { fmtc.NewLine() reindexRepository(ctx, ctx.Repo.Testing, false) } diff --git a/cli/cmd_release.go b/cli/cmd_release.go index 47da6640..4f73a91b 100644 --- a/cli/cmd_release.go +++ b/cli/cmd_release.go @@ -81,7 +81,7 @@ func releasePackagesFiles(ctx *context, files []repo.PackageFile) bool { released = true } - if released { + if released && !options.GetB(OPT_POSTPONE_INDEX) { fmtc.NewLine() reindexRepository(ctx, ctx.Repo.Release, false) } diff --git a/cli/cmd_remove.go b/cli/cmd_remove.go index d730b51f..f4735961 100644 --- a/cli/cmd_remove.go +++ b/cli/cmd_remove.go @@ -121,7 +121,7 @@ func removePackagesFiles(ctx *context, releaseFiles, testingFiles []repo.Package isCancelProtected = false - if releaseRemoved || testingRemoved { + if (releaseRemoved || testingRemoved) && !options.GetB(OPT_POSTPONE_INDEX) { fmtc.NewLine() if releaseRemoved { diff --git a/cli/cmd_unrelease.go b/cli/cmd_unrelease.go index 006af661..c2acdfbd 100644 --- a/cli/cmd_unrelease.go +++ b/cli/cmd_unrelease.go @@ -87,7 +87,7 @@ func unreleasePackagesFiles(ctx *context, files []repo.PackageFile) bool { unreleased = true } - if unreleased { + if unreleased && !options.GetB(OPT_POSTPONE_INDEX) { fmtc.NewLine() reindexRepository(ctx, ctx.Repo.Release, false) diff --git a/common/rep.spec b/common/rep.spec index a544b32a..90cb44a2 100644 --- a/common/rep.spec +++ b/common/rep.spec @@ -15,7 +15,7 @@ Summary: YUM repository management utility Name: rep -Version: 3.2.0 +Version: 3.3.0 Release: 0%{?dist} Group: Applications/System License: Apache 2.0 @@ -107,6 +107,10 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Mon Oct 09 2023 Anton Novojilov - 3.3.0-0 +- Added -pi/--postpone-index option to postpone index rebuild after some + commands + * Thu Oct 05 2023 Anton Novojilov - 3.2.0-0 - Added xz compression support for repository metadata - Added zst compression support for repository metadata From 9dfd31dc6700379da182866c00ed73cf3d6a8a6e Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 10 Oct 2023 12:31:49 +0300 Subject: [PATCH 03/31] Fix payload output --- cli/cmd_payload.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/cmd_payload.go b/cli/cmd_payload.go index 1427f530..313d25f7 100644 --- a/cli/cmd_payload.go +++ b/cli/cmd_payload.go @@ -70,9 +70,9 @@ func printPackagePayload(pkg *repo.Package, payloadType string) { archColoredTag = "[unknown]" } - fmtc.Printf(" ▾ "+archColoredTag+" {*}%s{!} {s-}(%s){!}\n\n", pkg.FullName(), pkg.Info.Summary) + fmtc.Printf(" ▾ "+archColoredTag+" {*}%s{!} {s-}(%s){!}\n", pkg.FullName(), pkg.Info.Summary) - fmtutil.Separator(true) + fmtutil.Separator(false) } switch payloadType { From 5e7f402d408e90392314387b23b853f970499fa8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 02:22:48 +0000 Subject: [PATCH 04/31] Bump github.com/essentialkaos/ek/v12 from 12.79.0 to 12.80.0 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.79.0 to 12.80.0. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.79.0...v12.80.0) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7d131f16..319b0961 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c github.com/essentialkaos/check v1.4.0 github.com/essentialkaos/depsy v1.1.0 - github.com/essentialkaos/ek/v12 v12.79.0 + github.com/essentialkaos/ek/v12 v12.80.0 github.com/klauspost/compress v1.17.0 github.com/mattn/go-sqlite3 v1.14.17 github.com/sassoftware/go-rpmutils v0.2.0 diff --git a/go.sum b/go.sum index 70de5d1c..2cd84825 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI= github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.79.0 h1:Dq/bCqk8/N5h/r5jJA2UHc1YoUEVYcc7xnR0DI5L9wA= -github.com/essentialkaos/ek/v12 v12.79.0/go.mod h1:S9/XSKhEAdylL3PF8GAnUeKKyd92VrDGR4YGacHfz0c= +github.com/essentialkaos/ek/v12 v12.80.0 h1:Yy3VF9J18qdhMZt1Tl7fKtjLvg6PdZX5rcDdk92KNys= +github.com/essentialkaos/ek/v12 v12.80.0/go.mod h1:X0gkyjBCP4QiD+sV4D52aquLDLGUmHteMEL7Rsgbev0= github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= From 5b61400be6fa639439b20e044ac8a1d3e47937e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 02:44:59 +0000 Subject: [PATCH 05/31] Bump github.com/klauspost/compress from 1.17.0 to 1.17.1 Bumps [github.com/klauspost/compress](https://github.com/klauspost/compress) from 1.17.0 to 1.17.1. - [Release notes](https://github.com/klauspost/compress/releases) - [Changelog](https://github.com/klauspost/compress/blob/master/.goreleaser.yml) - [Commits](https://github.com/klauspost/compress/compare/v1.17.0...v1.17.1) --- updated-dependencies: - dependency-name: github.com/klauspost/compress dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 319b0961..6b79029f 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/essentialkaos/check v1.4.0 github.com/essentialkaos/depsy v1.1.0 github.com/essentialkaos/ek/v12 v12.80.0 - github.com/klauspost/compress v1.17.0 + github.com/klauspost/compress v1.17.1 github.com/mattn/go-sqlite3 v1.14.17 github.com/sassoftware/go-rpmutils v0.2.0 github.com/ulikunitz/xz v0.5.11 diff --git a/go.sum b/go.sum index 2cd84825..46c6cf28 100644 --- a/go.sum +++ b/go.sum @@ -19,8 +19,8 @@ github.com/essentialkaos/ek/v12 v12.80.0/go.mod h1:X0gkyjBCP4QiD+sV4D52aquLDLGUm github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= -github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.1 h1:NE3C767s2ak2bweCZo3+rdP4U/HoyVXLv/X9f2gPS5g= +github.com/klauspost/compress v1.17.1/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= From 519fbc72b61fbc09a671a23e6664a3a436a5ec1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 02:21:32 +0000 Subject: [PATCH 06/31] Bump github.com/essentialkaos/ek/v12 from 12.80.0 to 12.82.0 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.80.0 to 12.82.0. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.80.0...v12.82.0) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 6b79029f..4bce0599 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c github.com/essentialkaos/check v1.4.0 github.com/essentialkaos/depsy v1.1.0 - github.com/essentialkaos/ek/v12 v12.80.0 + github.com/essentialkaos/ek/v12 v12.82.0 github.com/klauspost/compress v1.17.1 github.com/mattn/go-sqlite3 v1.14.17 github.com/sassoftware/go-rpmutils v0.2.0 diff --git a/go.sum b/go.sum index 46c6cf28..bfbe11ab 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI= github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.80.0 h1:Yy3VF9J18qdhMZt1Tl7fKtjLvg6PdZX5rcDdk92KNys= -github.com/essentialkaos/ek/v12 v12.80.0/go.mod h1:X0gkyjBCP4QiD+sV4D52aquLDLGUmHteMEL7Rsgbev0= +github.com/essentialkaos/ek/v12 v12.82.0 h1:8JqG7E1RWhMJq2CuSV0oaR96pmEjngLPG3cnJ++EJeQ= +github.com/essentialkaos/ek/v12 v12.82.0/go.mod h1:X0gkyjBCP4QiD+sV4D52aquLDLGUmHteMEL7Rsgbev0= github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= From f920b61ae49f6a494b157f312d54be039855384a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 02:07:07 +0000 Subject: [PATCH 07/31] Bump github.com/essentialkaos/ek/v12 from 12.82.0 to 12.83.1 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.82.0 to 12.83.1. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.82.0...v12.83.1) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4bce0599..5e447b89 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c github.com/essentialkaos/check v1.4.0 github.com/essentialkaos/depsy v1.1.0 - github.com/essentialkaos/ek/v12 v12.82.0 + github.com/essentialkaos/ek/v12 v12.83.1 github.com/klauspost/compress v1.17.1 github.com/mattn/go-sqlite3 v1.14.17 github.com/sassoftware/go-rpmutils v0.2.0 diff --git a/go.sum b/go.sum index bfbe11ab..fb8cff0b 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI= github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.82.0 h1:8JqG7E1RWhMJq2CuSV0oaR96pmEjngLPG3cnJ++EJeQ= -github.com/essentialkaos/ek/v12 v12.82.0/go.mod h1:X0gkyjBCP4QiD+sV4D52aquLDLGUmHteMEL7Rsgbev0= +github.com/essentialkaos/ek/v12 v12.83.1 h1:jNImDlEVKd7CoiUxctFqPp5K4ZwLFlHeMtE0UAoA9PA= +github.com/essentialkaos/ek/v12 v12.83.1/go.mod h1:X0gkyjBCP4QiD+sV4D52aquLDLGUmHteMEL7Rsgbev0= github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= From 8e89524cc1a1131249dfd0444b78e46a66997cec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 19:59:07 +0000 Subject: [PATCH 08/31] Bump github.com/klauspost/compress from 1.17.1 to 1.17.2 Bumps [github.com/klauspost/compress](https://github.com/klauspost/compress) from 1.17.1 to 1.17.2. - [Release notes](https://github.com/klauspost/compress/releases) - [Changelog](https://github.com/klauspost/compress/blob/master/.goreleaser.yml) - [Commits](https://github.com/klauspost/compress/compare/v1.17.1...v1.17.2) --- updated-dependencies: - dependency-name: github.com/klauspost/compress dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5e447b89..dcea3160 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/essentialkaos/check v1.4.0 github.com/essentialkaos/depsy v1.1.0 github.com/essentialkaos/ek/v12 v12.83.1 - github.com/klauspost/compress v1.17.1 + github.com/klauspost/compress v1.17.2 github.com/mattn/go-sqlite3 v1.14.17 github.com/sassoftware/go-rpmutils v0.2.0 github.com/ulikunitz/xz v0.5.11 diff --git a/go.sum b/go.sum index fb8cff0b..bb4aff70 100644 --- a/go.sum +++ b/go.sum @@ -19,8 +19,8 @@ github.com/essentialkaos/ek/v12 v12.83.1/go.mod h1:X0gkyjBCP4QiD+sV4D52aquLDLGUm github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.17.1 h1:NE3C767s2ak2bweCZo3+rdP4U/HoyVXLv/X9f2gPS5g= -github.com/klauspost/compress v1.17.1/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= +github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= From 9beadad055a9f0ed1e18bd0757cdf134e779f0d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 03:30:24 +0000 Subject: [PATCH 09/31] Bump github.com/essentialkaos/ek/v12 from 12.83.1 to 12.83.2 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.83.1 to 12.83.2. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.83.1...v12.83.2) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index dcea3160..afbd9576 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c github.com/essentialkaos/check v1.4.0 github.com/essentialkaos/depsy v1.1.0 - github.com/essentialkaos/ek/v12 v12.83.1 + github.com/essentialkaos/ek/v12 v12.83.2 github.com/klauspost/compress v1.17.2 github.com/mattn/go-sqlite3 v1.14.17 github.com/sassoftware/go-rpmutils v0.2.0 diff --git a/go.sum b/go.sum index bb4aff70..756ff6f1 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI= github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.83.1 h1:jNImDlEVKd7CoiUxctFqPp5K4ZwLFlHeMtE0UAoA9PA= -github.com/essentialkaos/ek/v12 v12.83.1/go.mod h1:X0gkyjBCP4QiD+sV4D52aquLDLGUmHteMEL7Rsgbev0= +github.com/essentialkaos/ek/v12 v12.83.2 h1:gXFwLIBAZsdi5uT/vJj9ka/rd94jLR1NF6OGxAYbgkQ= +github.com/essentialkaos/ek/v12 v12.83.2/go.mod h1:X0gkyjBCP4QiD+sV4D52aquLDLGUmHteMEL7Rsgbev0= github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= From f31c5b7bda483b86687bb254914bde4517af7a55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 03:29:46 +0000 Subject: [PATCH 10/31] Bump github.com/mattn/go-sqlite3 from 1.14.17 to 1.14.18 Bumps [github.com/mattn/go-sqlite3](https://github.com/mattn/go-sqlite3) from 1.14.17 to 1.14.18. - [Release notes](https://github.com/mattn/go-sqlite3/releases) - [Commits](https://github.com/mattn/go-sqlite3/compare/v1.14.17...v1.14.18) --- updated-dependencies: - dependency-name: github.com/mattn/go-sqlite3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index afbd9576..262f47c2 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/essentialkaos/depsy v1.1.0 github.com/essentialkaos/ek/v12 v12.83.2 github.com/klauspost/compress v1.17.2 - github.com/mattn/go-sqlite3 v1.14.17 + github.com/mattn/go-sqlite3 v1.14.18 github.com/sassoftware/go-rpmutils v0.2.0 github.com/ulikunitz/xz v0.5.11 golang.org/x/crypto v0.14.0 diff --git a/go.sum b/go.sum index 756ff6f1..5527daf8 100644 --- a/go.sum +++ b/go.sum @@ -28,8 +28,8 @@ 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.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM= -github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI= +github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= From 4af1125aa3f38f68faea9d4132346c98ec71f60b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Nov 2023 03:48:34 +0000 Subject: [PATCH 11/31] Bump golang.org/x/crypto from 0.14.0 to 0.15.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.14.0 to 0.15.0. - [Commits](https://github.com/golang/crypto/compare/v0.14.0...v0.15.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 262f47c2..21427762 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/mattn/go-sqlite3 v1.14.18 github.com/sassoftware/go-rpmutils v0.2.0 github.com/ulikunitz/xz v0.5.11 - golang.org/x/crypto v0.14.0 + golang.org/x/crypto v0.15.0 ) require ( @@ -23,5 +23,5 @@ require ( github.com/kr/text v0.2.0 // indirect github.com/rogpeppe/go-internal v1.10.0 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect - golang.org/x/sys v0.13.0 // indirect + golang.org/x/sys v0.14.0 // indirect ) diff --git a/go.sum b/go.sum index 5527daf8..101948e8 100644 --- a/go.sum +++ b/go.sum @@ -55,8 +55,8 @@ golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= 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.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= +golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -82,8 +82,8 @@ 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.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= 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= From a73f3ef37167f9ccee9b49a70c87255619f84841 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Thu, 9 Nov 2023 11:30:52 +0300 Subject: [PATCH 12/31] Improve 'check' command output --- cli/cmd_check.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cli/cmd_check.go b/cli/cmd_check.go index a4b421ff..23cac0c9 100644 --- a/cli/cmd_check.go +++ b/cli/cmd_check.go @@ -444,16 +444,17 @@ func printCheckErrorsInfo(errs errutil.Errors) bool { } errsList := errs.All() + maxErrs := mathutil.Min(errs.Num(), checkMaxErrNum) terminal.Error( "Found %s %s. First %s %s:\n", fmtutil.PrettyNum(errs.Num()), pluralize.Pluralize(errs.Num(), "problem", "problems"), - fmtutil.PrettyNum(checkMaxErrNum), - pluralize.Pluralize(checkMaxErrNum, "problem", "problems"), + fmtutil.PrettyNum(maxErrs), + pluralize.Pluralize(maxErrs, "problem", "problems"), ) - for i := 0; i < mathutil.Min(errs.Num(), checkMaxErrNum); i++ { + for i := 0; i < maxErrs; i++ { terminal.Error(" • %v", errsList[i]) } From cd1f4c96d5a8eeae45b3cddc32c9fea8d8bd4d84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 03:52:00 +0000 Subject: [PATCH 13/31] Bump github.com/essentialkaos/ek/v12 from 12.83.2 to 12.84.0 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.83.2 to 12.84.0. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.83.2...v12.84.0) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 21427762..79999b6e 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c github.com/essentialkaos/check v1.4.0 github.com/essentialkaos/depsy v1.1.0 - github.com/essentialkaos/ek/v12 v12.83.2 + github.com/essentialkaos/ek/v12 v12.84.0 github.com/klauspost/compress v1.17.2 github.com/mattn/go-sqlite3 v1.14.18 github.com/sassoftware/go-rpmutils v0.2.0 @@ -21,7 +21,7 @@ require ( github.com/essentialkaos/go-linenoise/v3 v3.4.0 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect - github.com/rogpeppe/go-internal v1.10.0 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect golang.org/x/sys v0.14.0 // indirect ) diff --git a/go.sum b/go.sum index 101948e8..b405d382 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI= github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.83.2 h1:gXFwLIBAZsdi5uT/vJj9ka/rd94jLR1NF6OGxAYbgkQ= -github.com/essentialkaos/ek/v12 v12.83.2/go.mod h1:X0gkyjBCP4QiD+sV4D52aquLDLGUmHteMEL7Rsgbev0= +github.com/essentialkaos/ek/v12 v12.84.0 h1:GtMuOoCV1kH7Me5iV6JlKFE4pAtFZpneOcrAZEbjBRQ= +github.com/essentialkaos/ek/v12 v12.84.0/go.mod h1:NSx0QzX8Fplo21PbGNBkmL1j5pyWVKErTgJeSB1kpdA= github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= @@ -34,8 +34,8 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +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/sassoftware/go-rpmutils v0.2.0 h1:pKW0HDYMFWQ5b4JQPiI3WI12hGsVoW0V8+GMoZiI/JE= github.com/sassoftware/go-rpmutils v0.2.0/go.mod h1:TJJQYtLe/BeEmEjelI3b7xNZjzAukEkeWKmoakvaOoI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= From 82de05dfee29fd6c9633850776e2919788e523b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 03:20:31 +0000 Subject: [PATCH 14/31] Bump github.com/essentialkaos/ek/v12 from 12.84.0 to 12.85.0 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.84.0 to 12.85.0. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.84.0...v12.85.0) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 79999b6e..56438530 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c github.com/essentialkaos/check v1.4.0 github.com/essentialkaos/depsy v1.1.0 - github.com/essentialkaos/ek/v12 v12.84.0 + github.com/essentialkaos/ek/v12 v12.85.0 github.com/klauspost/compress v1.17.2 github.com/mattn/go-sqlite3 v1.14.18 github.com/sassoftware/go-rpmutils v0.2.0 diff --git a/go.sum b/go.sum index b405d382..ca7e38fc 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI= github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.84.0 h1:GtMuOoCV1kH7Me5iV6JlKFE4pAtFZpneOcrAZEbjBRQ= -github.com/essentialkaos/ek/v12 v12.84.0/go.mod h1:NSx0QzX8Fplo21PbGNBkmL1j5pyWVKErTgJeSB1kpdA= +github.com/essentialkaos/ek/v12 v12.85.0 h1:OTmnQNnvpjUB1214uVU19rUhSKGsoocvIjAvUFJlXSo= +github.com/essentialkaos/ek/v12 v12.85.0/go.mod h1:NSx0QzX8Fplo21PbGNBkmL1j5pyWVKErTgJeSB1kpdA= github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= From 68198a01ade9ea5dcbfece7b91ba4970dab7567d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 04:03:11 +0000 Subject: [PATCH 15/31] Bump github.com/klauspost/compress from 1.17.2 to 1.17.3 Bumps [github.com/klauspost/compress](https://github.com/klauspost/compress) from 1.17.2 to 1.17.3. - [Release notes](https://github.com/klauspost/compress/releases) - [Changelog](https://github.com/klauspost/compress/blob/master/.goreleaser.yml) - [Commits](https://github.com/klauspost/compress/compare/v1.17.2...v1.17.3) --- updated-dependencies: - dependency-name: github.com/klauspost/compress dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 56438530..763a2959 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/essentialkaos/check v1.4.0 github.com/essentialkaos/depsy v1.1.0 github.com/essentialkaos/ek/v12 v12.85.0 - github.com/klauspost/compress v1.17.2 + github.com/klauspost/compress v1.17.3 github.com/mattn/go-sqlite3 v1.14.18 github.com/sassoftware/go-rpmutils v0.2.0 github.com/ulikunitz/xz v0.5.11 diff --git a/go.sum b/go.sum index ca7e38fc..1629bba2 100644 --- a/go.sum +++ b/go.sum @@ -19,8 +19,8 @@ github.com/essentialkaos/ek/v12 v12.85.0/go.mod h1:NSx0QzX8Fplo21PbGNBkmL1j5pyWV github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= -github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= +github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= From 2708809424767edd28870c6a0f9126b720a20dba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 03:57:35 +0000 Subject: [PATCH 16/31] Bump github.com/essentialkaos/ek/v12 from 12.85.0 to 12.86.0 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.85.0 to 12.86.0. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.85.0...v12.86.0) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 763a2959..966e3582 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c github.com/essentialkaos/check v1.4.0 github.com/essentialkaos/depsy v1.1.0 - github.com/essentialkaos/ek/v12 v12.85.0 + github.com/essentialkaos/ek/v12 v12.86.0 github.com/klauspost/compress v1.17.3 github.com/mattn/go-sqlite3 v1.14.18 github.com/sassoftware/go-rpmutils v0.2.0 diff --git a/go.sum b/go.sum index 1629bba2..2b8b9ff0 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI= github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.85.0 h1:OTmnQNnvpjUB1214uVU19rUhSKGsoocvIjAvUFJlXSo= -github.com/essentialkaos/ek/v12 v12.85.0/go.mod h1:NSx0QzX8Fplo21PbGNBkmL1j5pyWVKErTgJeSB1kpdA= +github.com/essentialkaos/ek/v12 v12.86.0 h1:9HMUsMsNvkgMH4OpQ0S6zhTphBQMl50MT6DYY0EUWg4= +github.com/essentialkaos/ek/v12 v12.86.0/go.mod h1:NSx0QzX8Fplo21PbGNBkmL1j5pyWVKErTgJeSB1kpdA= github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= From aaea69029c888cd8a5af5fdae6d378eba05daecc Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Mon, 20 Nov 2023 17:14:14 +0300 Subject: [PATCH 17/31] Add cleanup filtering --- cli/cli.go | 4 +++- cli/cmd_cleanup.go | 45 +++++++++++++++++++++++++-------------------- cli/cmd_help.go | 44 +++++++++++++------------------------------- go.mod | 4 ++-- go.sum | 7 ++++--- 5 files changed, 47 insertions(+), 57 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index 28464da6..059282a9 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -604,7 +604,7 @@ func genUsage() *usage.Info { info.AddCommand(COMMAND_WHICH_SOURCE, "Show source package name", "query…") info.AddCommand(COMMAND_INFO, "Show info about package", "package") info.AddCommand(COMMAND_PAYLOAD, "Show package payload", "package", "?type") - info.AddCommand(COMMAND_CLEANUP, "Remove old versions of packages", "?num") + info.AddCommand(COMMAND_CLEANUP, "Remove old versions of packages", "?num", "?filter") info.AddCommand(COMMAND_CHECK, "Check repositories consistency", "?errors-num") info.AddCommand(COMMAND_SIGN, "Sign one or more packages", "file…") info.AddCommand(COMMAND_RESIGN, "Resign all packages in repository") @@ -688,6 +688,8 @@ func genAbout(gitRev string) *usage.About { Owner: "ESSENTIAL KAOS", License: "Apache License, Version 2.0 ", UpdateChecker: usage.UpdateChecker{"essentialkaos/rep", update.GitHubChecker}, + + DescSeparator: "{s}—{!}", } if gitRev != "" { diff --git a/cli/cmd_cleanup.go b/cli/cmd_cleanup.go index 22579a1d..080917e4 100644 --- a/cli/cmd_cleanup.go +++ b/cli/cmd_cleanup.go @@ -22,8 +22,8 @@ import ( // ////////////////////////////////////////////////////////////////////////////////// // -// MIN_CLEANUP_VERS is minimal number of versions -const MIN_CLEANUP_VERS = 3 +// MIN_KEEP_CLEANUP_VERS is minimal number of versions to keep +const MIN_KEEP_CLEANUP_VERS = 3 // ////////////////////////////////////////////////////////////////////////////////// // @@ -32,7 +32,7 @@ func cmdCleanup(ctx *context, args options.Arguments) bool { var testingStack, releaseStack repo.PackageStack all := !options.GetB(OPT_RELEASE) && !options.GetB(OPT_TESTING) - keepVerNum, err := getCleanupVersionNum(args) + keepNum, filter, err := getCleanupOptions(args) if err != nil { terminal.Error(err.Error()) @@ -40,7 +40,7 @@ func cmdCleanup(ctx *context, args options.Arguments) bool { } if all || options.GetB(OPT_RELEASE) { - releaseStack, err = getStackToCleanup(ctx.Repo.Release, keepVerNum) + releaseStack, err = getStackToCleanup(ctx.Repo.Release, keepNum, filter) if err != nil { terminal.Error(err.Error()) @@ -49,7 +49,7 @@ func cmdCleanup(ctx *context, args options.Arguments) bool { } if all || options.GetB(OPT_TESTING) { - testingStack, err = getStackToCleanup(ctx.Repo.Testing, keepVerNum) + testingStack, err = getStackToCleanup(ctx.Repo.Testing, keepNum, filter) if err != nil { terminal.Error(err.Error()) @@ -67,28 +67,30 @@ func cmdCleanup(ctx *context, args options.Arguments) bool { // ////////////////////////////////////////////////////////////////////////////////// // -// getCleanupVersionNum returns number of versions from arguments -func getCleanupVersionNum(args options.Arguments) (int, error) { +// getCleanupOptions returns number of versions and filter from arguments +func getCleanupOptions(args options.Arguments) (int, string, error) { var err error - keepVerNum := MIN_CLEANUP_VERS + keepNum := MIN_KEEP_CLEANUP_VERS if args.Has(0) { - keepVerNum, err = args.Get(0).Int() + keepNum, err = args.Get(0).Int() if err != nil { - return 0, fmt.Errorf("Can't parse number of versions: %v", err) + return 0, "", fmt.Errorf("Can't parse number of versions: %v", err) } - if keepVerNum < MIN_CLEANUP_VERS { - return 0, fmt.Errorf( + if keepNum < MIN_KEEP_CLEANUP_VERS { + return 0, "", fmt.Errorf( "Number of versions can't be less than %d", - MIN_CLEANUP_VERS, + MIN_KEEP_CLEANUP_VERS, ) } } - return keepVerNum, nil + filter := args.Get(1).String() + + return keepNum, filter, nil } // cleanupPackages removes packages from both repositories @@ -121,19 +123,19 @@ func cleanupPackages(ctx *context, releaseStack, testingStack repo.PackageStack) } // getStackToCleanup returns stack with packages to remove -func getStackToCleanup(r *repo.SubRepository, keepVerNum int) (repo.PackageStack, error) { +func getStackToCleanup(r *repo.SubRepository, keepNum int, filter string) (repo.PackageStack, error) { stack, err := r.List("", true) if err != nil { return nil, err } - return extractPackagesToCleanup(stack, keepVerNum), nil + return extractPackagesToCleanup(stack, keepNum, filter), nil } // extractPackagesToCleanup extracts bundles to remove from stack // with all packages -func extractPackagesToCleanup(stack repo.PackageStack, keepVerNum int) repo.PackageStack { +func extractPackagesToCleanup(stack repo.PackageStack, keepNum int, filter string) repo.PackageStack { var result repo.PackageStack var prevPkgName, prevPkgVer string var pkgCount int @@ -147,6 +149,10 @@ func extractPackagesToCleanup(stack repo.PackageStack, keepVerNum int) repo.Pack continue } + if filter != "" && !strings.HasPrefix(pkg.Src, filter) { + continue + } + switch { case prevPkgName != pkg.Name: pkgCount = 1 @@ -156,10 +162,9 @@ func extractPackagesToCleanup(stack repo.PackageStack, keepVerNum int) repo.Pack } } - prevPkgName = pkg.Name - prevPkgVer = pkg.Version + prevPkgName, prevPkgVer = pkg.Name, pkg.Version - if pkgCount > keepVerNum { + if pkgCount > keepNum { result = append(result, bundle) } } diff --git a/cli/cmd_help.go b/cli/cmd_help.go index 9723649d..efa3ade1 100644 --- a/cli/cmd_help.go +++ b/cli/cmd_help.go @@ -81,7 +81,7 @@ func (c *commandHelp) Examples() { fmtc.Printf(" rep {y}%s{!} {s}%s{!}\n", c.command, example.command) } - fmtc.Printf("{s-}%s{!}\n", fmtutil.Wrap(example.desc, " ", 88)) + fmtc.Printf("{&}{s-}%s{!}\n", fmtutil.Wrap(example.desc, " ", 88)) if index+1 < len(c.examples) { fmtc.NewLine() @@ -124,7 +124,7 @@ func (c *commandHelp) Paragraph(text string) { // Query renders query info func (c *commandHelp) Query(short, long, desc, typ string) { - fmtc.Printf(" {m}%2s{!} {s}or{!} {m}%-12s{!} %s {s-}(%s){!}\n", short, long, desc, typ) + fmtc.Printf(" {m}%2s{!} {s}or{!} {m}%-12s{!} %s {&}{s-}(%s){!}\n", short, long, desc, typ) } // renderArgs renders command arguments with colors @@ -151,64 +151,44 @@ func cmdHelp(ctx *context, args options.Arguments) bool { switch cmdName { case "": helpAll() - case COMMAND_INIT: helpInit() - case COMMAND_GEN_KEY: helpGenKey() - case COMMAND_LIST, COMMAND_SHORT_LIST: helpList() - case COMMAND_WHICH_SOURCE, COMMAND_SHORT_WHICH_SOURCE: helpWhichSource() - case COMMAND_FIND, COMMAND_SHORT_FIND: helpFind() - case COMMAND_INFO, COMMAND_SHORT_INFO: helpInfo() - case COMMAND_PAYLOAD, COMMAND_SHORT_PAYLOAD: helpPayload() - case COMMAND_CLEANUP, COMMAND_SHORT_CLEANUP: helpCleanup() - case COMMAND_CHECK, COMMAND_SHORT_CHECK: helpCheck() - case COMMAND_SIGN, COMMAND_SHORT_SIGN: helpSign() - case COMMAND_RESIGN, COMMAND_SHORT_RESIGN: helpResign() - case COMMAND_ADD, COMMAND_SHORT_ADD: helpAdd() - case COMMAND_REMOVE, COMMAND_SHORT_REMOVE: helpRemove() - case COMMAND_RELEASE, COMMAND_SHORT_RELEASE: helpRelease() - case COMMAND_UNRELEASE, COMMAND_SHORT_UNRELEASE: helpUnrelease() - case COMMAND_REINDEX, COMMAND_SHORT_REINDEX: helpReindex() - case COMMAND_PURGE_CACHE, COMMAND_SHORT_PURGE_CACHE: helpPurgeCache() - case COMMAND_STATS, COMMAND_SHORT_STATS: helpStats() - case COMMAND_HELP, COMMAND_SHORT_HELP: helpHelp() - default: terminal.Error("Unknown command \"%s\"", cmdName) return false @@ -395,14 +375,14 @@ func helpFind() { help.Paragraph("More info about supported query data types:") - fmtc.Println(" {s-}•{!} String Any string value") - fmtc.Println(" {s-}•{!} Number Integer greater or equal to zero") - fmtc.Println(" {s-}•{!} Boolean Boolean value {s}(yes/true/1 or no/false/0){!}") - fmtc.Println(" {s-}•{!} SemVer Version in semantic versioning format") - fmtc.Println(" {s-}•{!} Dependency Package name with or without version and release condition") - fmtc.Println(" {s-}•{!} Architecture Package architecture {s}(" + strings.Join(data.ArchList, ", ") + "){!}") - fmtc.Println(" {s-}•{!} Size Size {s}(b/kb/mb/gb){!} with modificators {s-}(see examples){!}") - fmtc.Println(" {s-}•{!} Duration Duration in days or custom duration {s-}(see examples){!}") + fmtc.Println(" {s-}•{!} {&}String{!} Any string value") + fmtc.Println(" {s-}•{!} {&}Number{!} Integer greater or equal to zero") + fmtc.Println(" {s-}•{!} {&}Boolean{!} Boolean value {s}(yes/true/1 or no/false/0){!}") + fmtc.Println(" {s-}•{!} {&}SemVer{!} Version in semantic versioning format") + fmtc.Println(" {s-}•{!} {&}Dependency{!} Package name with or without version and release condition") + fmtc.Println(" {s-}•{!} {&}Architecture{!} Package architecture {s}(" + strings.Join(data.ArchList, ", ") + "){!}") + fmtc.Println(" {s-}•{!} {&}Size{!} Size {s}(b/kb/mb/gb){!} with modificators {s-}(see examples){!}") + fmtc.Println(" {s-}•{!} {&}Duration{!} Duration in days or custom duration {s-}(see examples){!}") fmtc.NewLine() @@ -485,11 +465,13 @@ func helpCleanup() { examples: []commandExample{ {"5", "Remove outdated packages except the 5 latest versions"}, {"10", "Remove outdated packages except the 10 latest versions"}, + {"5 nginx", "Remove outdated nginx packages except the 5 latest versions"}, }, } help.Usage() - help.Paragraph("Remove old versions of packages. Note that number of versions counts only different versions, so different releases of the same version counts as one version.") + help.Paragraph("Remove old versions of packages. Note that the number of versions only counts different versions, so different releases of the same version count as one version.") + help.Paragraph("You can also specify part of the source package name to filter the results and clean up outdated versions of only one package.") help.Shortcut() help.Examples() } diff --git a/go.mod b/go.mod index 966e3582..aec910bc 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c github.com/essentialkaos/check v1.4.0 github.com/essentialkaos/depsy v1.1.0 - github.com/essentialkaos/ek/v12 v12.86.0 + github.com/essentialkaos/ek/v12 v12.87.0 github.com/klauspost/compress v1.17.3 github.com/mattn/go-sqlite3 v1.14.18 github.com/sassoftware/go-rpmutils v0.2.0 @@ -16,7 +16,7 @@ require ( require ( github.com/DataDog/zstd v1.5.5 // indirect - github.com/cloudflare/circl v1.3.3 // indirect + github.com/cloudflare/circl v1.3.6 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/essentialkaos/go-linenoise/v3 v3.4.0 // indirect github.com/kr/pretty v0.3.1 // indirect diff --git a/go.sum b/go.sum index 2b8b9ff0..d1639dd9 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,9 @@ github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwS github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c h1:kMFnB0vCcX7IL/m9Y5LO+KQYv+t1CQOiFe6+SV2J7bE= github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= +github.com/cloudflare/circl v1.3.6 h1:/xbKIqSHbZXHwkhbrhrt2YOHIwYJlXH94E3tI/gDlUg= +github.com/cloudflare/circl v1.3.6/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -14,8 +15,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI= github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.86.0 h1:9HMUsMsNvkgMH4OpQ0S6zhTphBQMl50MT6DYY0EUWg4= -github.com/essentialkaos/ek/v12 v12.86.0/go.mod h1:NSx0QzX8Fplo21PbGNBkmL1j5pyWVKErTgJeSB1kpdA= +github.com/essentialkaos/ek/v12 v12.87.0 h1:9o231Jr8auHTS5B6xOy0zjp4+WdP4hohu9u4766GD8s= +github.com/essentialkaos/ek/v12 v12.87.0/go.mod h1:NSx0QzX8Fplo21PbGNBkmL1j5pyWVKErTgJeSB1kpdA= github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= From 7eeaeb7e5ea3f534202e58ba1d02a8cef68043cd Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Mon, 20 Nov 2023 17:14:33 +0300 Subject: [PATCH 18/31] Improve support info --- cli/support/support.go | 22 +++++++++++++++++++--- cli/support/support_linux.go | 9 ++++++--- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/cli/support/support.go b/cli/support/support.go index 9f95d082..02f813ec 100644 --- a/cli/support/support.go +++ b/cli/support/support.go @@ -11,6 +11,7 @@ import ( "fmt" "os" "runtime" + "runtime/debug" "strings" "github.com/essentialkaos/ek/v12/fmtc" @@ -94,6 +95,23 @@ func showDepsInfo(gomod []byte) { } } +// extractGitRevFromBuildInfo extracts git SHA from embedded build info +func extractGitRevFromBuildInfo() string { + info, ok := debug.ReadBuildInfo() + + if !ok { + return "" + } + + for _, s := range info.Settings { + if s.Key == "vcs.revision" && len(s.Value) > 7 { + return s.Value[:7] + } + } + + return "" +} + // getHashColorBullet return bullet with color from hash func getHashColorBullet(v string) string { if len(v) > 6 { @@ -105,7 +123,7 @@ func getHashColorBullet(v string) string { // printInfo formats and prints info record func printInfo(size int, name, value string) { - name = name + ":" + name += ":" size++ if value == "" { @@ -116,5 +134,3 @@ func printInfo(size int, name, value string) { fmtc.Printf(fm, name, value) } } - -// ////////////////////////////////////////////////////////////////////////////////// // diff --git a/cli/support/support_linux.go b/cli/support/support_linux.go index 0296fb1a..07ce80bd 100644 --- a/cli/support/support_linux.go +++ b/cli/support/support_linux.go @@ -27,8 +27,8 @@ func showOSInfo() { if err == nil { fmtutil.Separator(false, "OS INFO") - printInfo(12, "Name", osInfo.Name) - printInfo(12, "Pretty Name", osInfo.PrettyName) + printInfo(12, "Name", osInfo.ColoredName()) + printInfo(12, "Pretty Name", osInfo.ColoredPrettyName()) printInfo(12, "Version", osInfo.VersionID) printInfo(12, "ID", osInfo.ID) printInfo(12, "ID Like", osInfo.IDLike) @@ -82,5 +82,8 @@ func showEnvInfo() { crVer = strutil.Exclude(crVer, "Version: ") crVer = strings.ReplaceAll(crVer, " )", ")") - printInfo(12, "createrepo_c", crVer) + crVer = strings.ReplaceAll(crVer, "(", "{s-}(") + crVer = strings.ReplaceAll(crVer, ")", "){!}") + + printInfo(12, "createrepo_c", fmtc.Sprint(crVer)) } From 6922ec25dfa721a65d497a6f88e69d2d2e7a0693 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Mon, 20 Nov 2023 17:39:09 +0300 Subject: [PATCH 19/31] Improve help content rendering --- cli/cmd_help.go | 76 +++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 31 deletions(-) diff --git a/cli/cmd_help.go b/cli/cmd_help.go index efa3ade1..74382674 100644 --- a/cli/cmd_help.go +++ b/cli/cmd_help.go @@ -42,12 +42,12 @@ type commandExample struct { // Usage shows basic usage info func (c *commandHelp) Usage() { if len(configs) > 1 && !c.isGlobal { - fmtc.Print("{*}Usage:{!} rep {c}{repo-id}{!}") + fmtc.Print("{*}Usage:{!} rep {?repo}{repo-id}{!}") } else { fmtc.Print("{*}Usage:{!} rep") } - fmtc.Printf(" {y}%s{!}", c.command) + fmtc.Printf(" {?cmd}%s{!}", c.command) cmd := c.info.GetCommand(c.command) @@ -63,7 +63,7 @@ func (c *commandHelp) Usage() { // Shortcut shows info about shortcut version of command func (c *commandHelp) Shortcut() { fmtc.Println("{*}Shortcut:{!}\n") - fmtc.Printf(" {y}%s{!} → {y}%s{!}\n\n", c.command, c.shortcut) + fmtc.Printf(" {?cmd}%s{!} → {?cmd}%s{!}\n\n", c.command, c.shortcut) } // Examples shows usage examples @@ -76,9 +76,9 @@ func (c *commandHelp) Examples() { for index, example := range c.examples { if len(configs) > 1 && !c.isGlobal { - fmtc.Printf(" rep {c}{repo-id}{!} {y}%s{!} {s}%s{!}\n", c.command, example.command) + fmtc.Printf(" rep {c}{repo-id}{!} {?cmd}%s{!} {?arg}%s{!}\n", c.command, example.command) } else { - fmtc.Printf(" rep {y}%s{!} {s}%s{!}\n", c.command, example.command) + fmtc.Printf(" rep {?cmd}%s{!} {?arg}%s{!}\n", c.command, example.command) } fmtc.Printf("{&}{s-}%s{!}\n", fmtutil.Wrap(example.desc, " ", 88)) @@ -97,10 +97,6 @@ func (c *commandHelp) Options() { return } - if len(c.examples) != 0 { - fmtc.NewLine() - } - fmtc.Println("{*}Options:{!}\n") for _, option := range c.info.Options { @@ -114,6 +110,8 @@ func (c *commandHelp) Options() { option.Render() } + + fmtc.NewLine() } // Paragraph renders paragraph text @@ -146,6 +144,10 @@ func (c *commandHelp) renderArgs(args []string) string { // cmdHelp is 'help' command handler func cmdHelp(ctx *context, args options.Arguments) bool { + fmtc.NameColor("cmd", usage.DEFAULT_COMMANDS_COLOR_TAG) + fmtc.NameColor("arg", "{s}") + fmtc.NameColor("repo", "{c}") + cmdName := args.Get(0) switch cmdName { @@ -190,7 +192,7 @@ func cmdHelp(ctx *context, args options.Arguments) bool { case COMMAND_HELP, COMMAND_SHORT_HELP: helpHelp() default: - terminal.Error("Unknown command \"%s\"", cmdName) + terminal.Error("Unknown command %q", cmdName) return false } @@ -212,7 +214,7 @@ func helpAll() { } fmtc.NewLine() - fmtc.Println(" {s}For detailed information about command use{!} {y}help {command}{!}") + fmtc.Println(" {s}For detailed information about command use{!} {?cmd}help {command}{!}") } // helpInit shows help content about "init" command @@ -266,9 +268,18 @@ func helpList() { examples: []commandExample{ {"", "Show a list of all the latest versions of packages in all (release and testing) repositories"}, {"my-package", "Show a list of all versions of the package with the given name"}, - {info.GetOption(OPT_TESTING).String() + " my-package", "Show a list of all package versions with the given name only in the testing repository"}, - {"| grep my-package | grep -v '.src.'", "Show a list of packages files and filter it with grep"}, - {info.GetOption(OPT_PAGER).String() + " | more", "View long list of packages with some pager utility (more/less)"}, + { + info.GetOption(OPT_TESTING).String() + " my-package", + "Show a list of all package versions with the given name only in the testing repository", + }, + { + "| grep my-package | grep -v '.src.'", + "Show a list of packages files and filter it with grep", + }, + { + info.GetOption(OPT_PAGER).String() + " | more", + "View long list of packages with some pager utility (more/less)", + }, }, isGlobal: false, } @@ -277,8 +288,8 @@ func helpList() { help.Paragraph("The command shows a list of all packages in the repository. By default, the command shows only the latest versions of packages within all repositories.") help.Paragraph("You can filter the listing providing part of the package name. In this case, the command will show all versions of packages with the given name part.") help.Shortcut() - help.Examples() help.Options() + help.Examples() } // helpWhichSource shows help content about "which-source" command @@ -296,10 +307,10 @@ func helpWhichSource() { help.Usage() help.Paragraph("This command shows the source package used for package building or source package created while package building. This command is very useful for package searching. You may find the source package and use it in the search query ({s}s:{!} or {s}source:{!} query prefix with {y}" + COMMAND_REMOVE + "{!}, {y}" + COMMAND_RELEASE + "{!}, and {y}" + COMMAND_UNRELEASE + "{!} commands).") - help.Paragraph("You can use search query syntax for package selection. For more information about query syntax, see \"rep {y}" + COMMAND_HELP + "{!} {s}" + COMMAND_FIND + "{!}\".") + help.Paragraph("You can use search query syntax for package selection. For more information about query syntax, see \"rep {?cmd}" + COMMAND_HELP + "{!} {?arg}" + COMMAND_FIND + "{!}\".") help.Shortcut() - help.Examples() help.Options() + help.Examples() } // helpFind shows help content about "find" command @@ -389,8 +400,8 @@ func helpFind() { help.Paragraph("You can define a few filters at once, in this case, data that match the previous filter will be filtered by the next filter in the query. For negative search use additional colon ({s}:{!}) symbol.") help.Shortcut() - help.Examples() help.Options() + help.Examples() } // helpInfo shows help content about "info" command @@ -412,8 +423,8 @@ func helpInfo() { help.Usage() help.Paragraph("Show detailed information about a package. If the package version wasn't provided command will show information about the latest version.") help.Shortcut() - help.Examples() help.Options() + help.Examples() } // helpPayload shows help content about "payload" command @@ -452,8 +463,8 @@ func helpPayload() { ) fmtc.NewLine() help.Shortcut() - help.Examples() help.Options() + help.Examples() } // helpCleanup shows help content about "cleanup" command @@ -473,6 +484,7 @@ func helpCleanup() { help.Paragraph("Remove old versions of packages. Note that the number of versions only counts different versions, so different releases of the same version count as one version.") help.Paragraph("You can also specify part of the source package name to filter the results and clean up outdated versions of only one package.") help.Shortcut() + help.Options() help.Examples() } @@ -508,6 +520,7 @@ func helpSign() { help.Usage() help.Paragraph("Add GPG signature to RPM file or files.") help.Shortcut() + help.Options() help.Examples() } @@ -525,6 +538,7 @@ func helpResign() { help.Usage() help.Paragraph("Re-sign all packages in testing and release repositories.") help.Shortcut() + help.Options() help.Examples() } @@ -546,8 +560,8 @@ func helpAdd() { help.Usage() help.Paragraph("Add RPM file or files to the testing repository.") help.Shortcut() - help.Examples() help.Options() + help.Examples() } // helpRemove shows help content about "remove" command @@ -566,11 +580,11 @@ func helpRemove() { } help.Usage() - help.Paragraph("Remove package or packages from the testing repository. By default, the command removes packages from the testing repository. You can use option {g}" + info.GetOption(OPT_ALL).String() + "{!} for removing packages from the testing and release repository.") - help.Paragraph("The command uses search query syntax for package selection. For more information about query syntax, see \"rep {y}" + COMMAND_HELP + "{!} {s}" + COMMAND_FIND + "{!}\".") + help.Paragraph("Remove package or packages from the testing repository. By default, the command removes packages from the testing repository. You can use option {?opt}" + info.GetOption(OPT_ALL).String() + "{!} for removing packages from the testing and release repository.") + help.Paragraph("The command uses search query syntax for package selection. For more information about query syntax, see \"rep {?cmd}" + COMMAND_HELP + "{!} {?arg}" + COMMAND_FIND + "{!}\".") help.Shortcut() - help.Examples() help.Options() + help.Examples() } // helpRelease shows help content about "release" command @@ -587,10 +601,10 @@ func helpRelease() { help.Usage() help.Paragraph("Copy package or packages from the testing repository to the release repository.") - help.Paragraph("The command uses search query syntax for package selection. For more information about query syntax, see \"rep {y}" + COMMAND_HELP + "{!} {s}" + COMMAND_FIND + "{!}\".") + help.Paragraph("The command uses search query syntax for package selection. For more information about query syntax, see \"rep {?cmd}" + COMMAND_HELP + "{!} {?arg}" + COMMAND_FIND + "{!}\".") help.Shortcut() - help.Examples() help.Options() + help.Examples() } // helpUnrelease shows help content about "unrelease" command @@ -609,10 +623,10 @@ func helpUnrelease() { help.Usage() help.Paragraph("Remove package or packages from the release repository.") help.Paragraph("If package or packages were previously removed from the testing repository, this command will move packages from the release repository to testing.") - help.Paragraph("The command uses search query syntax for package selection. For more information about query syntax, see \"rep {y}" + COMMAND_HELP + "{!} {s}" + COMMAND_FIND + "{!}\".") + help.Paragraph("The command uses search query syntax for package selection. For more information about query syntax, see \"rep {?cmd}" + COMMAND_HELP + "{!} {?arg}" + COMMAND_FIND + "{!}\".") help.Shortcut() - help.Examples() help.Options() + help.Examples() } // helpReindex shows help content about "reindex" command @@ -633,8 +647,8 @@ func helpReindex() { help.Usage() help.Paragraph("Generate repository index with createrepo utility.") help.Shortcut() - help.Examples() help.Options() + help.Examples() } // helpPurgeCache shows help content about "purge-cache" command @@ -653,8 +667,8 @@ func helpPurgeCache() { help.Usage() help.Paragraph("Remove all cached SQLite databases.") help.Shortcut() - help.Examples() help.Options() + help.Examples() } // helpStats shows help content about "stats" command @@ -674,8 +688,8 @@ func helpStats() { help.Usage() help.Paragraph("Show repository statistics.") help.Shortcut() - help.Examples() help.Options() + help.Examples() } // helpHelp shows help content about "help" command From 4059d573e7355849bd34cc88024b328cca4f0858 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 22 Nov 2023 13:54:32 +0300 Subject: [PATCH 20/31] Improve pager support --- cli/cli.go | 49 ++++++++++++++++++++++--------------------------- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 25 insertions(+), 30 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index 059282a9..28b0f755 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -10,18 +10,18 @@ package cli import ( "fmt" "os" - "strings" - "github.com/essentialkaos/ek/v12/env" "github.com/essentialkaos/ek/v12/fmtc" "github.com/essentialkaos/ek/v12/fmtutil" "github.com/essentialkaos/ek/v12/fsutil" "github.com/essentialkaos/ek/v12/knf" "github.com/essentialkaos/ek/v12/options" + "github.com/essentialkaos/ek/v12/pager" "github.com/essentialkaos/ek/v12/progress" "github.com/essentialkaos/ek/v12/signal" "github.com/essentialkaos/ek/v12/system" "github.com/essentialkaos/ek/v12/terminal" + "github.com/essentialkaos/ek/v12/terminal/tty" "github.com/essentialkaos/ek/v12/usage" "github.com/essentialkaos/ek/v12/usage/completion/bash" "github.com/essentialkaos/ek/v12/usage/completion/fish" @@ -257,6 +257,10 @@ func Init(gitRev string, gomod []byte) { os.Exit(0) } + if options.GetB(OPT_PAGER) && tty.IsTTY() { + pager.Setup("") + } + checkPermissions() loadGlobalConfig() validateGlobalConfig() @@ -276,9 +280,6 @@ func Init(gitRev string, gomod []byte) { // configureUI configure user interface func configureUI() { - envVars := env.Get() - term := envVars.GetS("TERM") - fmtc.DisableColors = true fmtutil.SizeSeparator = " " fmtutil.SeparatorSymbol = "–" @@ -302,30 +303,23 @@ func configureUI() { fmtc.NameColor("package", "{m}") fmtc.NameColor("repo", "{c}") + if fmtc.IsColorsSupported() { + fmtc.DisableColors = false + } + if fmtc.Is256ColorsSupported() { fmtc.NameColor("package", "{#108}") fmtc.NameColor("repo", "{#33}") progress.DefaultSettings.BarFgColorTag = "{#33}" } - if term != "" { - switch { - case strings.Contains(term, "xterm"), - strings.Contains(term, "color"), - term == "screen": - fmtc.DisableColors = false - } - } - if options.GetB(OPT_NO_COLOR) { fmtc.DisableColors = true } - if !options.GetB(OPT_PAGER) { - if !fsutil.IsCharacterDevice("/dev/stdout") && envVars.GetS("FAKETTY") == "" { - fmtc.DisableColors = true - rawOutput = true - } + if !tty.IsTTY() { + fmtc.DisableColors = true + rawOutput = true } } @@ -335,12 +329,12 @@ func checkPermissions() { if err != nil { terminal.Error("Can't get info about current user: %v", err) - os.Exit(1) + shutdown(1) } if !curUser.IsRoot() { terminal.Error("This app requires superuser (root) privileges") - os.Exit(1) + shutdown(1) } } @@ -350,7 +344,7 @@ func loadGlobalConfig() { if err != nil { terminal.Error(err.Error()) - os.Exit(1) + shutdown(1) } } @@ -385,7 +379,7 @@ func validateGlobalConfig() { terminal.Error(" - %v", err) } - os.Exit(1) + shutdown(1) } // loadRepoConfigs loads repositories configuration files @@ -406,7 +400,7 @@ func loadRepoConfigs() { if err != nil { terminal.Error(err.Error()) - os.Exit(1) + shutdown(1) } configs[cfg.GetS(REPOSITORY_NAME)] = cfg @@ -450,7 +444,7 @@ func validateRepoConfigs() { } if hasErrors { - os.Exit(1) + shutdown(1) } } @@ -474,7 +468,7 @@ func configureRepoCache() { } if hasErrors { - os.Exit(1) + shutdown(1) } } @@ -542,6 +536,7 @@ func sigHandler() { // shutdown cleans temporary data and exits from CLI func shutdown(ec int) { + pager.Complete() os.Exit(ec) } @@ -630,7 +625,7 @@ func genUsage() *usage.Info { info.AddOption(OPT_SHOW_ALL, `Show all versions of packages {s-}(helpful with "list" command){!}`) info.AddOption(OPT_STATUS, "Show package status {s-}(released or not){!}") info.AddOption(OPT_EPOCH, `Show epoch info {s-}(helpful with "list" and "which-source" commands){!}`) - info.AddOption(OPT_PAGER, `Run command in "pager" mode {s-}(i.e. don't disable colors and don't show raw output){!}`) + info.AddOption(OPT_PAGER, "Use pager for long output") info.AddOption(OPT_NO_COLOR, "Disable colors in output") info.AddOption(OPT_HELP, "Show this help message") info.AddOption(OPT_VER, "Show version") diff --git a/go.mod b/go.mod index aec910bc..286704c4 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c github.com/essentialkaos/check v1.4.0 github.com/essentialkaos/depsy v1.1.0 - github.com/essentialkaos/ek/v12 v12.87.0 + github.com/essentialkaos/ek/v12 v12.88.1 github.com/klauspost/compress v1.17.3 github.com/mattn/go-sqlite3 v1.14.18 github.com/sassoftware/go-rpmutils v0.2.0 diff --git a/go.sum b/go.sum index d1639dd9..4d8165f7 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI= github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.87.0 h1:9o231Jr8auHTS5B6xOy0zjp4+WdP4hohu9u4766GD8s= -github.com/essentialkaos/ek/v12 v12.87.0/go.mod h1:NSx0QzX8Fplo21PbGNBkmL1j5pyWVKErTgJeSB1kpdA= +github.com/essentialkaos/ek/v12 v12.88.1 h1:JIfqfmBoRN7OFo9oychBmqqmOQJqebwlYU7Ao7vWxR8= +github.com/essentialkaos/ek/v12 v12.88.1/go.mod h1:NSx0QzX8Fplo21PbGNBkmL1j5pyWVKErTgJeSB1kpdA= github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= From a7e85dff4fa549205ecb48c677ac1b1c137ad5b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 03:25:28 +0000 Subject: [PATCH 21/31] Bump github.com/essentialkaos/ek/v12 from 12.88.1 to 12.90.0 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.88.1 to 12.90.0. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.88.1...v12.90.0) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 286704c4..e4fc0c57 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c github.com/essentialkaos/check v1.4.0 github.com/essentialkaos/depsy v1.1.0 - github.com/essentialkaos/ek/v12 v12.88.1 + github.com/essentialkaos/ek/v12 v12.90.0 github.com/klauspost/compress v1.17.3 github.com/mattn/go-sqlite3 v1.14.18 github.com/sassoftware/go-rpmutils v0.2.0 diff --git a/go.sum b/go.sum index 4d8165f7..e7eca022 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI= github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.88.1 h1:JIfqfmBoRN7OFo9oychBmqqmOQJqebwlYU7Ao7vWxR8= -github.com/essentialkaos/ek/v12 v12.88.1/go.mod h1:NSx0QzX8Fplo21PbGNBkmL1j5pyWVKErTgJeSB1kpdA= +github.com/essentialkaos/ek/v12 v12.90.0 h1:Y7WaRbrFY4JKPRYpjWbCOfVHWJPx8TZcIla8dXFJ2dI= +github.com/essentialkaos/ek/v12 v12.90.0/go.mod h1:NSx0QzX8Fplo21PbGNBkmL1j5pyWVKErTgJeSB1kpdA= github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= From 0cbc2cfa9224d20b6b89eeeeb9f6f40f2149d3fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 03:31:47 +0000 Subject: [PATCH 22/31] Bump golang.org/x/crypto from 0.15.0 to 0.16.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.15.0 to 0.16.0. - [Commits](https://github.com/golang/crypto/compare/v0.15.0...v0.16.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 286704c4..d7d853f4 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/mattn/go-sqlite3 v1.14.18 github.com/sassoftware/go-rpmutils v0.2.0 github.com/ulikunitz/xz v0.5.11 - golang.org/x/crypto v0.15.0 + golang.org/x/crypto v0.16.0 ) require ( @@ -23,5 +23,5 @@ require ( github.com/kr/text v0.2.0 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect - golang.org/x/sys v0.14.0 // indirect + golang.org/x/sys v0.15.0 // indirect ) diff --git a/go.sum b/go.sum index 4d8165f7..c700cbad 100644 --- a/go.sum +++ b/go.sum @@ -56,8 +56,8 @@ golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= 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.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= -golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= +golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= +golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= @@ -83,8 +83,8 @@ 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.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= 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= From be08cc6159bbf6d2e4ad7a31bc4830ac3f1d149b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 03:25:12 +0000 Subject: [PATCH 23/31] Bump github.com/essentialkaos/ek/v12 from 12.90.0 to 12.90.1 Bumps [github.com/essentialkaos/ek/v12](https://github.com/essentialkaos/ek) from 12.90.0 to 12.90.1. - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v12.90.0...v12.90.1) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v12 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 40af30b8..63b9a243 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c github.com/essentialkaos/check v1.4.0 github.com/essentialkaos/depsy v1.1.0 - github.com/essentialkaos/ek/v12 v12.90.0 + github.com/essentialkaos/ek/v12 v12.90.1 github.com/klauspost/compress v1.17.3 github.com/mattn/go-sqlite3 v1.14.18 github.com/sassoftware/go-rpmutils v0.2.0 diff --git a/go.sum b/go.sum index 5296a9d4..6ed14b86 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,8 @@ github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1n github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0= github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI= github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8= -github.com/essentialkaos/ek/v12 v12.90.0 h1:Y7WaRbrFY4JKPRYpjWbCOfVHWJPx8TZcIla8dXFJ2dI= -github.com/essentialkaos/ek/v12 v12.90.0/go.mod h1:NSx0QzX8Fplo21PbGNBkmL1j5pyWVKErTgJeSB1kpdA= +github.com/essentialkaos/ek/v12 v12.90.1 h1:ID950cnz4xgpqqFzhleP5xaVoLnPwuiykdH3FrogD/E= +github.com/essentialkaos/ek/v12 v12.90.1/go.mod h1:9efMqo1S8EtYhmeelOSTmMQDGC2vRgPkjkKKfvUD2eU= github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= From deda42a34238561dffc5c41dd1f74e544bea9483 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 07:59:37 +0000 Subject: [PATCH 24/31] Bump github.com/klauspost/compress from 1.17.3 to 1.17.4 Bumps [github.com/klauspost/compress](https://github.com/klauspost/compress) from 1.17.3 to 1.17.4. - [Release notes](https://github.com/klauspost/compress/releases) - [Changelog](https://github.com/klauspost/compress/blob/master/.goreleaser.yml) - [Commits](https://github.com/klauspost/compress/compare/v1.17.3...v1.17.4) --- updated-dependencies: - dependency-name: github.com/klauspost/compress dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 63b9a243..084af0cd 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/essentialkaos/check v1.4.0 github.com/essentialkaos/depsy v1.1.0 github.com/essentialkaos/ek/v12 v12.90.1 - github.com/klauspost/compress v1.17.3 + github.com/klauspost/compress v1.17.4 github.com/mattn/go-sqlite3 v1.14.18 github.com/sassoftware/go-rpmutils v0.2.0 github.com/ulikunitz/xz v0.5.11 diff --git a/go.sum b/go.sum index 6ed14b86..5ae48794 100644 --- a/go.sum +++ b/go.sum @@ -20,8 +20,8 @@ github.com/essentialkaos/ek/v12 v12.90.1/go.mod h1:9efMqo1S8EtYhmeelOSTmMQDGC2vR github.com/essentialkaos/go-linenoise/v3 v3.4.0 h1:g72w8x+/HIwOMBVvNaPYp+wMWVHrYZwzFAF7OfZR5Ts= github.com/essentialkaos/go-linenoise/v3 v3.4.0/go.mod h1:t1kNLY2bSMQCy1JXOefD2BDLs/TTPMtTv3DFNV5uDSI= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= -github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= From bd1d3ef784397996065a54cf05f7735d6920218f Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 5 Dec 2023 11:48:58 +0300 Subject: [PATCH 25/31] Code refactoring --- cli/cli.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index 28b0f755..99f30307 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -257,10 +257,6 @@ func Init(gitRev string, gomod []byte) { os.Exit(0) } - if options.GetB(OPT_PAGER) && tty.IsTTY() { - pager.Setup("") - } - checkPermissions() loadGlobalConfig() validateGlobalConfig() @@ -517,6 +513,12 @@ func process(args options.Arguments) bool { return false } + if options.GetB(OPT_PAGER) && tty.IsTTY() { + if pager.Setup() == nil { + defer pager.Complete() + } + } + // List repositories by default if args.Get(1).String() == "" { return runCommand(configs[repo], COMMAND_LIST, nil) @@ -536,7 +538,6 @@ func sigHandler() { // shutdown cleans temporary data and exits from CLI func shutdown(ec int) { - pager.Complete() os.Exit(ec) } From 05cfaf040671279e1db9a0c3ac67528ec428aa35 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 5 Dec 2023 11:57:11 +0300 Subject: [PATCH 26/31] Code refactoring --- cli/cli.go | 18 +++--------------- cli/cmd_cleanup.go | 6 ------ cli/cmd_gen_key.go | 5 ++--- cli/cmd_help.go | 4 ++-- cli/cmd_resign.go | 2 +- cli/common.go | 3 +-- 6 files changed, 9 insertions(+), 29 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index 99f30307..766c1f0e 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -549,11 +549,11 @@ func printCompletion() int { switch options.GetS(OPT_COMPLETION) { case "bash": - fmt.Printf(bash.Generate(info, APP)) + fmt.Print(bash.Generate(info, APP)) case "fish": - fmt.Printf(fish.Generate(info, APP)) + fmt.Print(fish.Generate(info, APP)) case "zsh": - fmt.Printf(zsh.Generate(info, optMap, APP)) + fmt.Print(zsh.Generate(info, optMap, APP)) default: return 1 } @@ -571,18 +571,6 @@ func printMan() { ) } -// genMan generates man page -func genMan() int { - fmt.Println( - man.Generate( - genUsage(), - genAbout(""), - ), - ) - - return 0 -} - // genUsage generates usage info func genUsage() *usage.Info { info := usage.NewInfo() diff --git a/cli/cmd_cleanup.go b/cli/cmd_cleanup.go index 080917e4..2b4b599e 100644 --- a/cli/cmd_cleanup.go +++ b/cli/cmd_cleanup.go @@ -195,9 +195,3 @@ func getMainPackageFromBundle(bundle repo.PackageBundle) *repo.Package { return nil } - -// printEmptyFoundPackageList prints empty packages listing -func printEmptyFoundPackageList(r *repo.SubRepository) { - fmtutil.Separator(true, strings.ToUpper(r.Name)) - fmtc.Println("\n{s-}-- no packages --{!}\n") -} diff --git a/cli/cmd_gen_key.go b/cli/cmd_gen_key.go index 9c08124b..8d868c7f 100644 --- a/cli/cmd_gen_key.go +++ b/cli/cmd_gen_key.go @@ -8,7 +8,6 @@ package cli // ////////////////////////////////////////////////////////////////////////////////// // import ( - "io/ioutil" "os" "regexp" "strings" @@ -130,7 +129,7 @@ func generateKeys(name, email string, password *secstr.String, outputPubKeyFile return false } - err = ioutil.WriteFile(outputPrivKeyFile, privKeyData, 0600) + err = os.WriteFile(outputPrivKeyFile, privKeyData, 0600) if err != nil { spinner.Update("Can't save private key: %v", err) @@ -138,7 +137,7 @@ func generateKeys(name, email string, password *secstr.String, outputPubKeyFile return false } - err = ioutil.WriteFile(outputPubKeyFile, pubKeyData, 0644) + err = os.WriteFile(outputPubKeyFile, pubKeyData, 0644) if err != nil { spinner.Update("Can't save public key: %v", err) diff --git a/cli/cmd_help.go b/cli/cmd_help.go index 74382674..6eece6f1 100644 --- a/cli/cmd_help.go +++ b/cli/cmd_help.go @@ -108,7 +108,7 @@ func (c *commandHelp) Options() { continue } - option.Render() + option.Print() } fmtc.NewLine() @@ -210,7 +210,7 @@ func helpAll() { continue } - c.Render() + c.Print() } fmtc.NewLine() diff --git a/cli/cmd_resign.go b/cli/cmd_resign.go index 0d95606f..465d51a3 100644 --- a/cli/cmd_resign.go +++ b/cli/cmd_resign.go @@ -55,7 +55,7 @@ how many packages you have and how big they are).`) // resignAllPackages re-singes all packages in testing and release repositories func resignAllPackages(ctx *context, key *sign.Key) bool { - var isResigned bool + isResigned := false if !resignRepoPackages(ctx, key, ctx.Repo.Testing) { ctx.Logger.Get(data.REPO_TESTING).Print("Packages re-signing finished with error") diff --git a/cli/common.go b/cli/common.go index ee75e741..52330099 100644 --- a/cli/common.go +++ b/cli/common.go @@ -325,8 +325,7 @@ func getRepoContext(repoCfg *knf.Config) (*context, error) { // getRepoStorage configures repository storage func getRepoStorage(typ string, repoCfg *knf.Config) (storage.Storage, error) { - switch typ { - case storage.TYPE_FS: + if typ == storage.TYPE_FS { return getRepoFSStorage(repoCfg) } From e95cf675dfc59cdd5a809d172243cf595c755a43 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 5 Dec 2023 13:24:45 +0300 Subject: [PATCH 27/31] Code refactoring --- cli/support/support_linux.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cli/support/support_linux.go b/cli/support/support_linux.go index 07ce80bd..465d87e7 100644 --- a/cli/support/support_linux.go +++ b/cli/support/support_linux.go @@ -13,9 +13,9 @@ import ( "github.com/essentialkaos/ek/v12/fmtc" "github.com/essentialkaos/ek/v12/fmtutil" - "github.com/essentialkaos/ek/v12/fsutil" "github.com/essentialkaos/ek/v12/strutil" "github.com/essentialkaos/ek/v12/system" + "github.com/essentialkaos/ek/v12/system/container" ) // ////////////////////////////////////////////////////////////////////////////////// // @@ -29,11 +29,12 @@ func showOSInfo() { printInfo(12, "Name", osInfo.ColoredName()) printInfo(12, "Pretty Name", osInfo.ColoredPrettyName()) - printInfo(12, "Version", osInfo.VersionID) + printInfo(12, "Version", osInfo.Version) printInfo(12, "ID", osInfo.ID) printInfo(12, "ID Like", osInfo.IDLike) printInfo(12, "Version ID", osInfo.VersionID) printInfo(12, "Version Code", osInfo.VersionCodename) + printInfo(12, "Platform ID", osInfo.PlatformID) printInfo(12, "CPE", osInfo.CPEName) } @@ -53,11 +54,13 @@ func showOSInfo() { containerEngine := "No" - switch { - case fsutil.IsExist("/.dockerenv"): + switch container.GetEngine() { + case container.DOCKER: containerEngine = "Yes (Docker)" - case fsutil.IsExist("/run/.containerenv"): + case container.PODMAN: containerEngine = "Yes (Podman)" + case container.LXC: + containerEngine = "Yes (LXC)" } fmtc.NewLine() From a70d979122f747fe5f0016f9909d593c20319612 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 5 Dec 2023 13:31:51 +0300 Subject: [PATCH 28/31] Update project ID on codeclimate --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d95bd84f..e23988ad 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

GoReportCard - Code Climate Maintainability + Code Climate Maintainability codebeat badge GitHub Actions CI Status GitHub Actions CodeQL Status From a8826786799f472cb885fd205d749434af50e383 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 5 Dec 2023 13:33:16 +0300 Subject: [PATCH 29/31] Update README --- README.md | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index e23988ad..7693a57b 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Commands which-source query… Show source package name info package Show info about package payload package type Show package payload - cleanup num Remove old versions of packages + cleanup num filter Remove old versions of packages check errors-num Check repositories consistency sign file… Sign one or more packages resign Resign all packages in repository @@ -84,22 +84,23 @@ Commands Options - --release, -r Run command only on release (stable) repository - --testing, -t Run command only on testing (unstable) repository - --all, -a Run command on all repositories - --arch, -aa arch Package architecture (helpful with "info" and "payload" commands) - --move, -m Move (remove after successful action) packages (helpful with "add" command) - --no-source, -ns Ignore source packages (helpful with "add" command) - --ignore-filter, -if Ignore repository file filter (helpful with "add" and "sign" commands) - --force, -f Answer "yes" for all questions - --full, -F Full reindex (helpful with "reindex" command) - --show-all, -A Show all versions of packages (helpful with "list" command) - --status, -S Show package status (released or not) - --epoch, -E Show epoch info (helpful with "list" and "which-source" commands) - --pager, -P Run command in "pager" mode (i.e. don't disable colors and don't show raw output) - --no-color, -nc Disable colors in output - --help, -h Show this help message - --version, -v Show version + --release, -r Run command only on release (stable) repository + --testing, -t Run command only on testing (unstable) repository + --all, -a Run command on all repositories + --arch, -aa arch Package architecture (helpful with "info" and "payload" commands) + --move, -m Move (remove after successful action) packages (helpful with "add" command) + --no-source, -ns Ignore source packages (helpful with "add" command) + --ignore-filter, -if Ignore repository file filter (helpful with "add" and "sign" commands) + --postpone-index, -pi Postpone repository reindex (helpful with "add", "remove", "release", and "unrelase" commands) + --force, -f Answer "yes" for all questions + --full, -F Full reindex (helpful with "reindex" command) + --show-all, -A Show all versions of packages (helpful with "list" command) + --status, -S Show package status (released or not) + --epoch, -E Show epoch info (helpful with "list" and "which-source" commands) + --pager, -P Use pager for long output + --no-color, -nc Disable colors in output + --help, -h Show this help message + --version, -v Show versio ``` ### CI Status From 12117fadd7f7b943c39d408d6db0b2b4bae67f30 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 5 Dec 2023 13:51:38 +0300 Subject: [PATCH 30/31] Minor UI improvements --- cli/cli.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index 766c1f0e..80524775 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -575,11 +575,14 @@ func printMan() { func genUsage() *usage.Info { info := usage.NewInfo() + if fmtc.Is256ColorsSupported() { + info.AppNameColorTag = "{*}{#33}" + } + info.AddSpoiler( - "Notice that if you have more than one repository you should define its name as\n" + - "the first argument. You can read detailed info about every command with usage\n" + - "examples using {y}help{!} command.", - ) + ` Note that if you have more than one repository, you should specify its name + as the first argument. You can read detailed information about each command + with usage examples by using the {y}help{!} command.`) info.AddCommand(COMMAND_INIT, "Initialize new repository", "arch…") info.AddCommand(COMMAND_GEN_KEY, "Generate keys for signing packages") From fcf2eaf40213a485f13bda35970ab155d26a7c13 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 5 Dec 2023 13:56:31 +0300 Subject: [PATCH 31/31] Spec update --- common/rep.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/rep.spec b/common/rep.spec index 90cb44a2..176da9e2 100644 --- a/common/rep.spec +++ b/common/rep.spec @@ -27,7 +27,7 @@ Source100: checksum.sha512 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: golang >= 1.20 +BuildRequires: golang >= 1.21 Requires: createrepo_c @@ -110,6 +110,10 @@ rm -rf %{buildroot} * Mon Oct 09 2023 Anton Novojilov - 3.3.0-0 - Added -pi/--postpone-index option to postpone index rebuild after some commands +- Added package filtering for 'cleanup' command +- Improved pagers (more/less) support +- UI improvements +- Fixed 'payload' command output * Thu Oct 05 2023 Anton Novojilov - 3.2.0-0 - Added xz compression support for repository metadata