From 3e7a2c79328da3236d558fc87ec4103ad29bf9f9 Mon Sep 17 00:00:00 2001 From: mk-pmb Date: Mon, 21 Jul 2014 22:31:06 +0200 Subject: [PATCH 1/3] start.sh: fail when cd fails, silent on non-tty --- start.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/start.sh b/start.sh index f81c281..d2959ca 100755 --- a/start.sh +++ b/start.sh @@ -1,6 +1,5 @@ -#!/bin/sh - -echo "Starting kippo in the background...\n" -cd $(dirname $0) +#!/bin/bash +# -*- coding: utf-8, tab-width: 2 -*- +cd "$(dirname "$0")" || exit $? +tty --silent && echo 'Starting kippo in the background...' twistd -y kippo.tac -l log/kippo.log --pidfile kippo.pid - From 50937f2ed67bb03a643744b1dae4d3c3104ada38 Mon Sep 17 00:00:00 2001 From: mk-pmb Date: Mon, 21 Jul 2014 22:33:02 +0200 Subject: [PATCH 2/3] start.sh: report twistd's return value if error --- start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.sh b/start.sh index d2959ca..d4bdf44 100755 --- a/start.sh +++ b/start.sh @@ -2,4 +2,4 @@ # -*- coding: utf-8, tab-width: 2 -*- cd "$(dirname "$0")" || exit $? tty --silent && echo 'Starting kippo in the background...' -twistd -y kippo.tac -l log/kippo.log --pidfile kippo.pid +twistd -y kippo.tac -l log/kippo.log --pidfile kippo.pid || exit $? From 8c0b92140f243a53384805f3e6f5edbaae008d02 Mon Sep 17 00:00:00 2001 From: mk-pmb Date: Mon, 21 Jul 2014 22:46:34 +0200 Subject: [PATCH 3/3] start/stop: find symlinked $0; stop: chmod+x, integer PIDs only --- start.sh | 2 +- stop.sh | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) mode change 100644 => 100755 stop.sh diff --git a/start.sh b/start.sh index d4bdf44..4e8ecd2 100755 --- a/start.sh +++ b/start.sh @@ -1,5 +1,5 @@ #!/bin/bash # -*- coding: utf-8, tab-width: 2 -*- -cd "$(dirname "$0")" || exit $? +cd "$(readlink -m "$0"/..)" || exit $? tty --silent && echo 'Starting kippo in the background...' twistd -y kippo.tac -l log/kippo.log --pidfile kippo.pid || exit $? diff --git a/stop.sh b/stop.sh old mode 100644 new mode 100755 index ab2747f..8ce8537 --- a/stop.sh +++ b/stop.sh @@ -1,12 +1,11 @@ -#!/bin/sh +#!/bin/bash +# -*- coding: utf-8, tab-width: 2 -*- +cd "$(readlink -m "$0"/..)" || exit $? PIDFILE=kippo.pid - -cd $(dirname $0) - -PID=$(cat $PIDFILE 2>/dev/null) +PID=$(LANG=C grep -xPe '[0-9]+' -m 1 "$PIDFILE" 2>/dev/null) if [ -n "$PID" ]; then - echo "Stopping kippo...\n" - kill -TERM $PID + echo 'Stopping kippo...' + kill -TERM "$PID" fi