Merge pull request #1619 from hashicorp/b-internal-ui

Fixes the static asset generator for new pkg path, updates assets.
hashicorp · Jan 15, 2016 · b6f03d3 · b6f03d3
2 parents 8683896 + f24a044
commit b6f03d3
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 108 deletions.
diff --git a/Makefile b/Makefile
@@ -72,7 +72,7 @@ generate: deps
 # generates the static web ui
 static-assets: deps
 	@echo "--> Generating static assets"
-	@go-bindata-assetfs -pkg agent -prefix ui ./ui/dist/...
+	@go-bindata-assetfs -pkg agent -prefix pkg ./pkg/web_ui/...
 	@mv bindata_assetfs.go command/agent
 	$(MAKE) format