Skip to content

Commit 6598b48

Browse files
authored
Merge pull request #254 from edoardottt/devel
Devel update
2 parents ab47c03 + 7015f11 commit 6598b48

File tree

6 files changed

+59
-36
lines changed

6 files changed

+59
-36
lines changed

.goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ builds:
3333
main: ./cmd/pphack/
3434

3535
archives:
36-
- format: zip
36+
- formats: [zip]
3737
name_template: '{{ .ProjectName }}_{{ .Version }}_{{ if eq .Os "darwin" }}macOS{{ else }}{{ .Os }}{{ end }}_{{ .Arch }}'
3838

3939
checksum:

Makefile

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,54 @@
1-
REPO=github.com/edoardottt/pphack
1+
# Makefile for pphack
2+
3+
REPO := github.com/edoardottt/pphack
4+
BINARY_NAME := pphack
5+
CMD_DIR := ./cmd/$(BINARY_NAME)
6+
BIN_PATH := /usr/local/bin/$(BINARY_NAME)
7+
8+
.PHONY: all remod update lint build clean test install uninstall
9+
10+
all: build
211

312
remod:
4-
@rm -rf go.*
5-
@go mod init ${REPO}
13+
@echo "Reinitializing Go module..."
14+
@rm -f go.mod go.sum
15+
@go mod init $(REPO)
616
@go get ./...
717
@go mod tidy -v
8-
@echo "Done."
18+
@echo "Go module reinitialized."
919

1020
update:
21+
@echo "Updating dependencies..."
1122
@go get -u ./...
1223
@go mod tidy -v
13-
@echo "Done."
24+
@echo "Dependencies updated."
1425

1526
lint:
27+
@echo "Running linter..."
1628
@golangci-lint run
29+
@echo "Linting complete."
1730

1831
build:
19-
@go build ./cmd/pphack/
20-
@sudo mv pphack /usr/local/bin/
21-
@echo "Done."
32+
@echo "Building $(BINARY_NAME)..."
33+
@go build -o $(BINARY_NAME) $(CMD_DIR)
34+
@echo "Build complete."
2235

23-
clean:
24-
@sudo rm -rf /usr/local/bin/pphack
25-
@echo "Done."
36+
install: build
37+
@echo "Installing $(BINARY_NAME) to $(BIN_PATH)..."
38+
@sudo mv $(BINARY_NAME) $(BIN_PATH)
39+
@echo "Installed successfully."
40+
41+
uninstall:
42+
@echo "Uninstalling $(BINARY_NAME) from $(BIN_PATH)..."
43+
@sudo rm -f $(BIN_PATH)
44+
@echo "Uninstalled."
2645

2746
test:
47+
@echo "Running tests with race detector..."
2848
@go test -race ./...
29-
@echo "Done."
49+
@echo "Tests complete."
50+
51+
clean:
52+
@echo "Cleaning build artifacts..."
53+
@rm -f $(BINARY_NAME)
54+
@echo "Clean complete."

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Install 📡
4545
go install github.com/edoardottt/pphack/cmd/pphack@latest
4646
```
4747

48-
pphack relies on [`chromedp`](https://github.com/chromedp/chromedp), so you need a Chrome or Chromium browser.
48+
pphack relies on [`chromedp`](https://github.com/chromedp/chromedp), so you need Chrome or Chromium-based browser.
4949

5050
Get Started 🎉
5151
----------

go.mod

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,20 @@ require (
77
github.com/edoardottt/golazy v0.1.4
88
github.com/projectdiscovery/goflags v0.1.74
99
github.com/projectdiscovery/gologger v1.1.54
10-
github.com/projectdiscovery/utils v0.4.18
10+
github.com/projectdiscovery/utils v0.4.19
1111
github.com/stretchr/testify v1.10.0
1212
go.uber.org/ratelimit v0.3.1
1313
)
1414

1515
require (
1616
github.com/STARRY-S/zip v0.2.1 // indirect
17-
github.com/bodgit/plumbing v1.3.0 // indirect
18-
github.com/bodgit/sevenzip v1.6.0 // indirect
19-
github.com/bodgit/windows v1.0.1 // indirect
20-
github.com/hashicorp/errwrap v1.1.0 // indirect
21-
github.com/hashicorp/go-multierror v1.1.1 // indirect
22-
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
23-
github.com/mholt/archives v0.1.0 // indirect
24-
github.com/nwaples/rardecode/v2 v2.0.0-beta.4.0.20241112120701-034e449c6e78 // indirect
25-
github.com/sorairolake/lzip-go v0.3.5 // indirect
26-
github.com/therootcompany/xz v1.0.1 // indirect
27-
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
28-
golang.org/x/text v0.23.0 // indirect
29-
)
30-
31-
require (
3217
github.com/andybalholm/brotli v1.1.1 // indirect
3318
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3419
github.com/aymerick/douceur v0.2.0 // indirect
3520
github.com/benbjohnson/clock v1.3.5 // indirect
21+
github.com/bodgit/plumbing v1.3.0 // indirect
22+
github.com/bodgit/sevenzip v1.6.0 // indirect
23+
github.com/bodgit/windows v1.0.1 // indirect
3624
github.com/chromedp/cdproto v0.0.0-20250403032234-65de8f5d025b
3725
github.com/chromedp/sysutil v1.1.0 // indirect
3826
github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08 // indirect
@@ -44,29 +32,38 @@ require (
4432
github.com/gobwas/ws v1.4.0 // indirect
4533
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
4634
github.com/gorilla/css v1.0.1 // indirect
35+
github.com/hashicorp/errwrap v1.1.0 // indirect
36+
github.com/hashicorp/go-multierror v1.1.1 // indirect
37+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
4738
github.com/json-iterator/go v1.1.12 // indirect
4839
github.com/klauspost/compress v1.17.11 // indirect
4940
github.com/klauspost/pgzip v1.2.6 // indirect
5041
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
5142
github.com/mattn/go-isatty v0.0.20 // indirect
43+
github.com/mholt/archives v0.1.0 // indirect
5244
github.com/microcosm-cc/bluemonday v1.0.27 // indirect
5345
github.com/miekg/dns v1.1.63 // indirect
5446
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5547
github.com/modern-go/reflect2 v1.0.2 // indirect
48+
github.com/nwaples/rardecode/v2 v2.0.0-beta.4.0.20241112120701-034e449c6e78 // indirect
5649
github.com/pierrec/lz4/v4 v4.1.22 // indirect
5750
github.com/pkg/errors v0.9.1 // indirect
5851
github.com/pmezard/go-difflib v1.0.0 // indirect
5952
github.com/projectdiscovery/blackrock v0.0.1 // indirect
6053
github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect
54+
github.com/sorairolake/lzip-go v0.3.5 // indirect
55+
github.com/therootcompany/xz v1.0.1 // indirect
6156
github.com/tidwall/gjson v1.18.0 // indirect
6257
github.com/tidwall/match v1.1.1 // indirect
6358
github.com/tidwall/pretty v1.2.1 // indirect
6459
github.com/ulikunitz/xz v0.5.12 // indirect
60+
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
6561
golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 // indirect
6662
golang.org/x/mod v0.23.0 // indirect
6763
golang.org/x/net v0.38.0 // indirect
6864
golang.org/x/sync v0.12.0 // indirect
6965
golang.org/x/sys v0.31.0 // indirect
66+
golang.org/x/text v0.23.0 // indirect
7067
golang.org/x/tools v0.29.0 // indirect
7168
gopkg.in/djherbis/times.v1 v1.3.0 // indirect
7269
gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ github.com/projectdiscovery/goflags v0.1.74 h1:n85uTRj5qMosm0PFBfsvOL24I7TdWRcWq
158158
github.com/projectdiscovery/goflags v0.1.74/go.mod h1:UMc9/7dFz2oln+10tv6cy+7WZKTHf9UGhaNkF95emh4=
159159
github.com/projectdiscovery/gologger v1.1.54 h1:WMzvJ8j/4gGfPKpCttSTaYCVDU1MWQSJnk3wU8/U6Ws=
160160
github.com/projectdiscovery/gologger v1.1.54/go.mod h1:vza/8pe2OKOt+ujFWncngknad1XWr8EnLKlbcejOyUE=
161-
github.com/projectdiscovery/utils v0.4.18 h1:cSjMOLXI5gAajfA6KV+0iQG4dGx2IHWLQyND/Snvw7k=
162-
github.com/projectdiscovery/utils v0.4.18/go.mod h1:y5gnpQn802iEWqf0djTRNskJlS62P5eqe1VS1+ah0tk=
161+
github.com/projectdiscovery/utils v0.4.19 h1:rWOOTWUMQK9gvgH01rrw0qFi0hrh712hM1pCUzapCqA=
162+
github.com/projectdiscovery/utils v0.4.19/go.mod h1:y5gnpQn802iEWqf0djTRNskJlS62P5eqe1VS1+ah0tk=
163163
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
164164
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
165165
github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=

pkg/output/output.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,13 @@ func (o *Result) Printed(result string) bool {
4444
return true
4545
}
4646

47-
// JSONOutput checks and prints JSON output.
47+
// JSONOutput marshals and prints the JSON output.
4848
func JSONOutput(json *ResultData) {
49-
o, err := FormatJSON(json)
49+
data, err := FormatJSON(json)
5050
if err != nil {
5151
gologger.Error().Msg(err.Error())
52-
} else {
53-
fmt.Println(string(o))
52+
return
5453
}
54+
55+
fmt.Println(string(data))
5556
}

0 commit comments

Comments
 (0)