From 0cac2fbb40d73885fa7af7ba86afb81eedaabaad Mon Sep 17 00:00:00 2001 From: Goffi Date: Fri, 27 Dec 2019 13:30:20 +0100 Subject: [PATCH] bin: look for twistd3 first: on some GNU/Linux discributions, `twistd` script is named `twistd3`, so sat script is now looking for `twistd3` first. If none is found, a message is printed on stderr and the script exit with an error code. --- bin/sat | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bin/sat b/bin/sat index a3a9a334..6ccea7b4 100755 --- a/bin/sat +++ b/bin/sat @@ -3,7 +3,16 @@ DEBUG="" DAEMON="" PYTHON="python3" -TWISTD="$(which twistd)" + +# for Python 3, "twistd" is named "twistd3" on some distros, so we check for it first +TWISTD="$(which twistd3 2>/dev/null)" +if [ $? -ne 0 ]; then + TWISTD="$(which twistd 2>/dev/null)" +fi +if [ $? -ne 0 ]; then + printf "Can't find \"twistd\" script, are you sure that Twisted is installed?\n" + exit 1 +fi kill_process() { # $1 is the file containing the PID to kill, $2 is the process name