Permalink
Browse files

Merge branch 'master' of http://github.com/developit/Moat

  • Loading branch information...
nickcoutsos committed Feb 8, 2012
2 parents 4bb9cd2 + 6f189b8 commit 8d957c208b8048bc7cb90a47d6eea2f08adfc36d
Showing with 17 additions and 6 deletions.
  1. +2 −0 nohup.out
  2. +15 −6 run.sh
View
@@ -14,3 +14,5 @@ WARNING:root:404 GET /js/libs/mobile-scroll.js (::1) 0.77ms
WARNING:root:404 GET /favicon.ico (::1) 0.59ms
WARNING:root:404 GET /js/libs/mobile-scroll.js (::1) 0.52ms
WARNING:root:404 GET /favicon.ico (::1) 0.59ms
+WARNING:root:404 GET /js/libs/mobile-scroll.js (::1) 0.61ms
+WARNING:root:404 GET /favicon.ico (::1) 0.45ms
View
21 run.sh
@@ -1,15 +1,24 @@
#!/bin/bash
+# kill running server
-# kill running moat.py
-
-ps | grep moat.py$ | cut -d' ' -f1 | xargs kill
+if ["$1"="stop"]; then
+ ps | grep moat.py$ | cut -d' ' -f1 | xargs kill
+fi
# start new server
-if [ $1=="bg" ]; then
+if ["$1"="start"]; then
nohup python moat.py &
-else
- python moat.py &
fi
+
+
+# restart server
+
+if ["$1"="restart"]; then
+ ps | grep moat.py$ | cut -d' ' -f1 | xargs kill
+ nohup python moat.py &
+fi
+
+

0 comments on commit 8d957c2

Please sign in to comment.