refactor: move entrypoint to cmd (ooni#43)

ainghazal · May 8, 2023 · 06d680b · 06d680b
1 parent 7216b3e
commit 06d680b
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 194 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ COVERAGE_THRESHOLD := 88
 FLAGS=-ldflags="-w -s -buildid=none -linkmode=external" -buildmode=pie -buildvcs=false
 
 build:
-	@go build ${FLAGS}
+	@go build -o ./minivpn ${FLAGS} ./cmd/minivpn/
 
 build-rel:
 	@go build ${FLAGS} -o minivpn

diff --git a/main.go → cmd/minivpn/main.go b/main.go → cmd/minivpn/main.go
diff --git a/proxy.go → cmd/minivpn/proxy.go b/proxy.go → cmd/minivpn/proxy.go
diff --git a/cmd/ndt7/README.md b/cmd/ndt7/README.md
diff --git a/cmd/ndt7/main.go b/cmd/ndt7/main.go
diff --git a/cmd/obfs4vpn/main.go b/cmd/obfs4vpn/main.go
diff --git a/cmd/vpnping/main.go b/cmd/vpnping/main.go
@@ -8,6 +8,8 @@ import (
 	"github.com/ooni/minivpn/vpn"
 )
 
+// TODO(ainghazal): update and convert to an example
+
 func main() {
 	opts, err := vpn.NewOptionsFromFilePath("data/riseup/config")
 	if err != nil {