diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-02-03 10:45:58 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-02-03 10:45:58 -0800 |
| commit | bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1 (patch) | |
| tree | 1626d089802a92ee208b6e7fa056378e40568a92 /Makefile | |
| parent | 581785f5044eecdc7cf664e4c7fc59efc6babc96 (diff) | |
| parent | 9bba6c79882d1f5d14b98052caf59a11fc2388d5 (diff) | |
| download | chat-bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1.tar.gz chat-bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1.tar.bz2 chat-bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1.zip | |
Merge branch 'master' into PLT-1429
Diffstat (limited 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 |