Regenerate assets and improve generate command

owncloud · Dec 8, 2020 · 3fbe506 · 3fbe506
1 parent 3b8680f
commit 3fbe506
Show file tree

Hide file tree

Showing 2 changed files with 372 additions and 23 deletions.
diff --git a/ocis-phoenix/Makefile b/ocis-phoenix/Makefile
@@ -77,7 +77,7 @@ lint:
 	for PKG in $(PACKAGES); do go run golang.org/x/lint/golint -set_exit_status $$PKG || exit 1; done;
 
 .PHONY: generate
-generate: assets
+generate: pull-assets
 	go generate $(GENERATE)
 
 .PHONY: changelog
@@ -178,5 +178,6 @@ watch:
 # .PHONY: protobuf
 # protobuf:  $(GOPATH)/bin/protoc-gen-go $(GOPATH)/bin/protoc-gen-micro $(GOPATH)/bin/protoc-gen-microweb $(GOPATH)/bin/protoc-gen-swagger pkg/proto/v0/example.pb.go pkg/proto/v0/example.pb.micro.go pkg/proto/v0/example.pb.web.go pkg/proto/v0/example.swagger.json
 
-assets:
-	mkdir assets/ && curl -slL -o- https://github.com/owncloud/phoenix/releases/download/$(PHOENIX_ASSETS_VERSION)/phoenix.tar.gz | tar xvzf - -C assets/
+.PHONY: pull-assets
+pull-assets:
+	rm -Rf assets && mkdir assets/ && curl -slL -o- https://github.com/owncloud/phoenix/releases/download/$(PHOENIX_ASSETS_VERSION)/phoenix.tar.gz | tar xvzf - -C assets/
diff --git a/ocis-phoenix/pkg/assets/embed.go b/ocis-phoenix/pkg/assets/embed.go