Merge branch 'master' into fix-inconsistent-output

dev
Ice3man 2020-09-11 09:23:48 -07:00 committed by GitHub
commit 02bf886fca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions

View File

@ -103,7 +103,7 @@ Download latest binary from https://github.com/projectdiscovery/nuclei/releases
nuclei requires **go1.14+** to install successfully. Run the following command to get the repo - nuclei requires **go1.14+** to install successfully. Run the following command to get the repo -
```sh ```sh
▶ GO111MODULE=auto go get -u -v github.com/projectdiscovery/nuclei/v2/cmd/nuclei ▶ GO111MODULE=on go get -u -v github.com/projectdiscovery/nuclei/v2/cmd/nuclei
``` ```
### From Github ### From Github

View File

@ -213,6 +213,8 @@ func (r *Runner) preloadWorkflowTemplates(p progress.IProgress, workflow *workfl
ProxyURL: r.options.ProxyURL, ProxyURL: r.options.ProxyURL,
ProxySocksURL: r.options.ProxySocksURL, ProxySocksURL: r.options.ProxySocksURL,
CustomHeaders: r.options.CustomHeaders, CustomHeaders: r.options.CustomHeaders,
JSON: r.options.JSON,
JSONRequests: r.options.JSONRequests,
CookieJar: jar, CookieJar: jar,
ColoredOutput: !r.options.NoColor, ColoredOutput: !r.options.NoColor,
Colorizer: r.colorizer, Colorizer: r.colorizer,
@ -223,6 +225,8 @@ func (r *Runner) preloadWorkflowTemplates(p progress.IProgress, workflow *workfl
Debug: r.options.Debug, Debug: r.options.Debug,
Template: t, Template: t,
Writer: r.output, Writer: r.output,
JSON: r.options.JSON,
JSONRequests: r.options.JSONRequests,
ColoredOutput: !r.options.NoColor, ColoredOutput: !r.options.NoColor,
Colorizer: r.colorizer, Colorizer: r.colorizer,
Decolorizer: r.decolorizer, Decolorizer: r.decolorizer,