From 708919bfb67398ca6d0464553faf10aadc28893b Mon Sep 17 00:00:00 2001 From: Shulhan Date: Thu, 14 Dec 2023 20:07:50 +0700 Subject: internal/cmd: add flag "address" for command www-awwan This is to allow using different address when running on local, without conflict with "serve-www" task in Makefile. --- Makefile | 5 ++--- internal/cmd/www-awwan/main.go | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 677bcc4..227cce0 100644 --- a/Makefile +++ b/Makefile @@ -96,9 +96,8 @@ serve-www: go run ./internal/cmd/www-awwan -dev .PHONY: install-www -install-www: build-www - mkdir -p /data/app/bin/ - rsync --progress ./www-awwan /data/app/bin/ +install-www: embed + go install ./internal/cmd/www-awwan .PHONY: deploy-www deploy-www: GOOS=linux GOARCH=amd64 CGO_ENABLED=0 diff --git a/internal/cmd/www-awwan/main.go b/internal/cmd/www-awwan/main.go index 0467af1..e78380a 100644 --- a/internal/cmd/www-awwan/main.go +++ b/internal/cmd/www-awwan/main.go @@ -25,6 +25,7 @@ const defAddress = `127.0.0.1:4358` var MemfsWww *memfs.MemFS func main() { + var flagAddress = flag.String(`address`, defAddress, `Address to listen for client`) var flagDev = flag.Bool(`dev`, false, `Watch local changes`) flag.Parse() @@ -63,11 +64,11 @@ func main() { os.Exit(0) }() - log.Printf(`--- Starting %s at http://%s with dev=%v`, binName, defAddress, *flagDev) + log.Printf(`--- Starting %s at http://%s with dev=%v`, binName, *flagAddress, *flagDev) var optsServe = &ciigo.ServeOptions{ Mfs: MemfsWww, - Address: defAddress, + Address: *flagAddress, ConvertOptions: internal.DocConvertOpts, IsDevelopment: *flagDev, } -- cgit v1.3