summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-02-22 16:38:54 -0800
committerCorey Hulen <corey@hulen.com>2016-02-22 16:38:54 -0800
commitf8959b78bdd5ee06ed5d3250683d0950ab21c12d (patch)
tree64773f75cee578ba5ec62aac234ea14dd5848fe6 /Makefile
parent7553246e65b4e92b593fdf7bf8d86770d077b491 (diff)
parent2b89197e71c30061f2abff9dc6577411dfabbc9f (diff)
downloadchat-f8959b78bdd5ee06ed5d3250683d0950ab21c12d.tar.gz
chat-f8959b78bdd5ee06ed5d3250683d0950ab21c12d.tar.bz2
chat-f8959b78bdd5ee06ed5d3250683d0950ab21c12d.zip
Merge pull request #2214 from hmhealey/plt1422
PLT-1422 Fixed Makefile to properly kill watchify on stop-client
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 126bb75b1..a7c277e4c 100644
--- a/Makefile
+++ b/Makefile
@@ -308,7 +308,12 @@ stop-client:
done
@for PID in $$(ps -ef | grep [n]pm | awk '{ print $$2 }'); do \
- echo stopping watchify $$PID; \
+ echo stopping client $$PID; \
+ kill $$PID; \
+ done
+
+ @for PID in $$(ps -ef | grep [w]atchify | awk '{ print $$2 }'); do \
+ echo stopping client $$PID; \
kill $$PID; \
done