diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-02-03 07:34:02 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-02-03 07:34:02 -0500 |
commit | b7a241f5d95b4c6d46972227ee8621c47ca435be (patch) | |
tree | 7d4efcae7d495cd1d6aaa7bd18826dc0816529d5 | |
parent | 4a09adeb391b23c7e850fec96a2e8a731b70d755 (diff) | |
parent | ad64f315f338db0d1dda89bd58eca5b5799c8c1a (diff) | |
download | chat-b7a241f5d95b4c6d46972227ee8621c47ca435be.tar.gz chat-b7a241f5d95b4c6d46972227ee8621c47ca435be.tar.bz2 chat-b7a241f5d95b4c6d46972227ee8621c47ca435be.zip |
Merge pull request #2028 from mozilla/Makefile-fixes
Adjustments to makefile
-rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -151,7 +151,7 @@ package: sed -i'.bak' 's|bundle.js|bundle-$(BUILD_NUMBER).min.js|g' $(DIST_PATH)/web/templates/head.html sed -i'.bak' 's|libs.min.js|libs-$(BUILD_NUMBER).min.js|g' $(DIST_PATH)/web/templates/head.html rm $(DIST_PATH)/web/templates/*.bak - + sudo mv -f $(DIST_PATH)/config/config.json.bak $(DIST_PATH)/config/config.json || echo 'nomv' tar -C dist -czf $(DIST_PATH).tar.gz mattermost @@ -283,7 +283,7 @@ run: start-docker .prepare-go .prepare-jsx $(GO) run $(GOFLAGS) mattermost.go -config=config.json & @echo Starting compass watch - cd web/sass-files && compass watch & + cd web/sass-files && compass compile && compass watch & stop: @for PID in $$(ps -ef | grep [c]ompass | awk '{ print $$2 }'); do \ @@ -296,7 +296,7 @@ stop: kill $$PID; \ done - @for PID in $$(ps -ef | grep [m]atterm | awk '{ print $$2 }'); do \ + @for PID in $$(ps -ef | grep [m]atterm | grep -v VirtualBox | awk '{ print $$2 }'); do \ echo stopping go web $$PID; \ kill $$PID; \ done |