makefile improvements and typo fix

Makefile

@@ -290,21 +290,30 @@ run: build
 build_ship_integration_test:
 	docker build -t $(DOCKER_REPO)/ship-e2e-test:latest -f ./integration/Dockerfile .
 
-pkg/lifecycle/daemon/ui.bindatafs.go: .state/build-deps
+pkg/lifecycle/daemon/ui.bindatafs.go: .state/mark-ui-gitignored .state/build-deps web/app/.state/built-ui
 	go-bindata-assetfs -pkg daemon \
 	  -o pkg/lifecycle/daemon/ui.bindatafs.go \
 	  -prefix web/app \
 	  web/app/build/...
 
-mark-ui-gitignored:
-	cd pkg/lifecycle/daemon/; git update-index --assume-unchanged ui.bindatafs.go
+mark-ui-gitignored: .state/mark-ui-gitignored
 
+.state/mark-ui-gitignored:
+	cd pkg/lifecycle/daemon/; git update-index --assume-unchanged ui.bindatafs.go
+	@mkdir -p .state/
+	@touch .state/mark-ui-gitignored
 
 embed-ui: mark-ui-gitignored build-ui pkg/lifecycle/daemon/ui.bindatafs.go
 
 embed-ui-dev: mark-ui-gitignored build-ui-dev pkg/lifecycle/daemon/ui.bindatafs.go
 
 ci-embed-ui: mark-ui-gitignored pkg/lifecycle/daemon/ui.bindatafs.go
+
+# this file will be updated by build-ui and build-ui-dev, causing ui.bindata.fs to be regenerated
+web/app/.state/built-ui:
+	@mkdir -p web/app/.state/
+	@touch web/app/.state/built-ui
+
 build-ui:
 	$(MAKE) -C web/app build_ship
 

pkg/lifecycle/daemon/ui.go

@@ -29,7 +29,7 @@ func (b *binaryFileSystem) Exists(prefix string, filepath string) bool {
 			debug.Log("event", "file.open.err", "err", err)
 			return false
 		}
-		debug.Log("event", "file.open.sucess")
+		debug.Log("event", "file.open.success")
 		return true
 	}
 	debug.Log("event", "file.prefix.miss")

web/app/Makefile

@@ -47,11 +47,13 @@ serve_ship:
 	yarn build
 	@mkdir -p .state
 	@touch .state/build_ship
+	@touch .state/built-ui
 
 .state/build_ship_dev: deps-dev
 	yarn build
 	@mkdir -p .state
 	@touch .state/build_ship_dev
+	@touch .state/built-ui
 
 build_ship: .state/build_ship