From 85d6968526614a885c6729483df28bb54869786b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 13:02:12 +0000 Subject: [PATCH 1/3] chore(deps): bump github.com/projectdiscovery/gologger Bumps [github.com/projectdiscovery/gologger](https://github.com/projectdiscovery/gologger) from 1.1.19 to 1.1.22. - [Release notes](https://github.com/projectdiscovery/gologger/releases) - [Commits](https://github.com/projectdiscovery/gologger/compare/v1.1.19...v1.1.22) --- updated-dependencies: - dependency-name: github.com/projectdiscovery/gologger 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 3a875ec..e5febfc 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/charmbracelet/glamour v0.6.0 github.com/google/go-github v17.0.0+incompatible github.com/projectdiscovery/goflags v0.1.64 - github.com/projectdiscovery/gologger v1.1.21 + github.com/projectdiscovery/gologger v1.1.22 github.com/projectdiscovery/utils v0.2.8 github.com/stretchr/testify v1.9.0 golang.org/x/oauth2 v0.13.0 diff --git a/go.sum b/go.sum index bcf0cc0..2848574 100644 --- a/go.sum +++ b/go.sum @@ -126,8 +126,8 @@ github.com/projectdiscovery/blackrock v0.0.1 h1:lHQqhaaEFjgf5WkuItbpeCZv2DUIE45k github.com/projectdiscovery/blackrock v0.0.1/go.mod h1:ANUtjDfaVrqB453bzToU+YB4cUbvBRpLvEwoWIwlTss= github.com/projectdiscovery/goflags v0.1.64 h1:FDfwdt9N97Hi8OuhbkDlKtVttpc/CRMIWQVa08VsHsI= github.com/projectdiscovery/goflags v0.1.64/go.mod h1:3FyHIVQtnycNOc1LE3O1jj/XR5XuMdF9QfHd0ujhnX4= -github.com/projectdiscovery/gologger v1.1.21 h1:FD9MGE9adY/y2IxDpQgPZIvZAkQIx3bvcuY+d1FLQUo= -github.com/projectdiscovery/gologger v1.1.21/go.mod h1:eyvlcHiSuzJQtwmh+fcfwZVaqVgSGtEP1oL1gJFgP3c= +github.com/projectdiscovery/gologger v1.1.22 h1:wMj1vZEsGOJbPI1zE21OpgZWLMmU5l8M2EawOXjusIs= +github.com/projectdiscovery/gologger v1.1.22/go.mod h1:1Ty1drRfXKy+uMTHsoAF8f9n94qjDJWZy5h9PJWiqlU= github.com/projectdiscovery/machineid v0.0.0-20240226150047-2e2c51e35983 h1:ZScLodGSezQVwsQDtBSMFp72WDq0nNN+KE/5DHKY5QE= github.com/projectdiscovery/machineid v0.0.0-20240226150047-2e2c51e35983/go.mod h1:3G3BRKui7nMuDFAZKR/M2hiOLtaOmyukT20g88qRQjI= github.com/projectdiscovery/utils v0.2.8 h1:++NcCJ+lXEfNBHKBs6q+cWa8JrVS8cYdGcW9jOgZebI= From 84479c3270c64c03a5b2011268054932c38aad94 Mon Sep 17 00:00:00 2001 From: Mzack9999 Date: Mon, 2 Sep 2024 16:48:43 +0200 Subject: [PATCH 2/3] lint --- internal/runner/runner.go | 2 +- pkg/path/path.go | 5 ----- pkg/path/windows.go | 5 ----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/internal/runner/runner.go b/internal/runner/runner.go index 25cf9fa..69a5181 100644 --- a/internal/runner/runner.go +++ b/internal/runner/runner.go @@ -261,7 +261,7 @@ func FetchFromCache() ([]types.Tool, error) { // ListToolsAndEnv prints the list of tools func (r *Runner) ListToolsAndEnv(tools []types.Tool) error { - gologger.Info().Msgf(path.GetOsData() + "\n") + gologger.Info().Msgf("%s\n", path.GetOsData()) gologger.Info().Msgf("Path to download project binary: %s\n", r.options.Path) var fmtMsg string if path.IsSet(r.options.Path) { diff --git a/pkg/path/path.go b/pkg/path/path.go index 2cf3e29..088c4f1 100644 --- a/pkg/path/path.go +++ b/pkg/path/path.go @@ -10,11 +10,6 @@ import ( fileutil "github.com/projectdiscovery/utils/file" ) -type Config struct { - shellName string - rcFile string -} - func IsSet(path string) bool { ok, _ := isSet(path) return ok diff --git a/pkg/path/windows.go b/pkg/path/windows.go index d8ea49a..99adfb7 100644 --- a/pkg/path/windows.go +++ b/pkg/path/windows.go @@ -94,11 +94,6 @@ func write(path string, cur []string) error { return nil } -func paths() []string { - configuredPaths, _ := getPathsFromRegistry() - return configuredPaths -} - func getPathsFromRegistry() ([]string, error) { k, err := registry.OpenKey(registry.CURRENT_USER, `Environment`, registry.QUERY_VALUE) if err != nil { From cd69d5f8c3fdb04a31e503eeb9423f5d6681bdb5 Mon Sep 17 00:00:00 2001 From: Mzack9999 Date: Mon, 2 Sep 2024 16:50:52 +0200 Subject: [PATCH 3/3] revert --- pkg/path/path.go | 5 +++++ pkg/path/windows.go | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkg/path/path.go b/pkg/path/path.go index 088c4f1..2cf3e29 100644 --- a/pkg/path/path.go +++ b/pkg/path/path.go @@ -10,6 +10,11 @@ import ( fileutil "github.com/projectdiscovery/utils/file" ) +type Config struct { + shellName string + rcFile string +} + func IsSet(path string) bool { ok, _ := isSet(path) return ok diff --git a/pkg/path/windows.go b/pkg/path/windows.go index 99adfb7..d8ea49a 100644 --- a/pkg/path/windows.go +++ b/pkg/path/windows.go @@ -94,6 +94,11 @@ func write(path string, cur []string) error { return nil } +func paths() []string { + configuredPaths, _ := getPathsFromRegistry() + return configuredPaths +} + func getPathsFromRegistry() ([]string, error) { k, err := registry.OpenKey(registry.CURRENT_USER, `Environment`, registry.QUERY_VALUE) if err != nil {