diff options
| author | Alan Mooiman <amooiman@gmail.com> | 2016-01-29 15:02:05 -0800 |
|---|---|---|
| committer | Alan Mooiman <amooiman@gmail.com> | 2016-01-29 15:02:05 -0800 |
| commit | ad64f315f338db0d1dda89bd58eca5b5799c8c1a (patch) | |
| tree | 39102177b9912f5c364cf9117d68bd3db6b1ca01 /Makefile | |
| parent | 7ff7c864611590347cb6a230d31635ecabdc4f25 (diff) | |
| download | chat-ad64f315f338db0d1dda89bd58eca5b5799c8c1a.tar.gz chat-ad64f315f338db0d1dda89bd58eca5b5799c8c1a.tar.bz2 chat-ad64f315f338db0d1dda89bd58eca5b5799c8c1a.zip | |
Adjustments to makefile
Compass will compile on first run (instead of having to make a change to a sass file)
Stop command won't kill virtualbox processes that are also named "mattermost". If we're going to wildcard kill processes, let's not go overboard.
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 |