diff --git a/Makefile b/Makefile index 44e184ad7..677f0d5d4 100644 --- a/Makefile +++ b/Makefile @@ -140,9 +140,14 @@ kopia-ui-with-local-htmlui-changes: rm -f $(kopia_ui_embedded_exe) GOWORK=$(CURDIR)/tools/localhtmlui.work $(MAKE) kopia-ui +install-with-local-htmlui-changes: export GOWORK=$(CURDIR)/tools/localhtmlui.work install-with-local-htmlui-changes: +ifeq ($(GOOS),windows) + (cd ../htmlui && npm run build && push_local.cmd) +else (cd ../htmlui && npm run build && ./push_local.sh) - GOWORK=$(CURDIR)/tools/localhtmlui.work $(MAKE) install +endif + $(MAKE) install # build-current-os-noui compiles a binary for the current os/arch in the same location as goreleaser # kopia-ui build needs this particular location to embed the correct server binary. diff --git a/go.mod b/go.mod index 956f3d262..1af589d7b 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/klauspost/compress v1.16.3 github.com/klauspost/pgzip v1.2.5 github.com/klauspost/reedsolomon v1.11.7 - github.com/kopia/htmluibuild v0.0.0-20220928042710-9fdd02afb1e7 + github.com/kopia/htmluibuild v0.0.0-20230326183719-f482ef17e2c9 github.com/kylelemons/godebug v1.1.0 github.com/mattn/go-colorable v0.1.13 github.com/minio/minio-go/v7 v7.0.49 diff --git a/go.sum b/go.sum index 14c69bcba..848223fc3 100644 --- a/go.sum +++ b/go.sum @@ -184,8 +184,8 @@ github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/klauspost/reedsolomon v1.11.7 h1:9uaHU0slncktTEEg4+7Vl7q7XUNMBUOK4R9gnKhMjAU= github.com/klauspost/reedsolomon v1.11.7/go.mod h1:4bXRN+cVzMdml6ti7qLouuYi32KHJ5MGv0Qd8a47h6A= -github.com/kopia/htmluibuild v0.0.0-20220928042710-9fdd02afb1e7 h1:WP5VfIQL7AaYkO4zTNSCsVOawTzudbc4tvLojvg0RKc= -github.com/kopia/htmluibuild v0.0.0-20220928042710-9fdd02afb1e7/go.mod h1:eWer4rx9P8lJo2eKc+Q7AZ1dE1x1hJNdkbDFPzMu1Hw= +github.com/kopia/htmluibuild v0.0.0-20230326183719-f482ef17e2c9 h1:s5Wa89s8RlPjuwqd8K8kuf+T9Kz4+NsbKwR/pJ3PAT0= +github.com/kopia/htmluibuild v0.0.0-20230326183719-f482ef17e2c9/go.mod h1:eWer4rx9P8lJo2eKc+Q7AZ1dE1x1hJNdkbDFPzMu1Hw= github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=