чување 7a824333aaf2c796a366bc87beaf3e42c5cf2bda родитељ cd7f424eeec7ef3cb7e381c974a4fb1ca470b311 Аутор: Страхиња Радић <contact@strahinja.org> Датум: Mon, 18 Jul 2022 15:21:07 +0200 Switch to pkill/pidof Signed-off-by: Страхиња Радић <contact@strahinja.org> Diffstat:
| M | svc.d/bare.sh | | | 24 | +++++++++--------------- |
измењених датотека: 1, додавања: 9(+), брисања: 15(-)
diff --git a/svc.d/bare.sh b/svc.d/bare.sh @@ -33,7 +33,7 @@ case $1 in exit 0;; -s) if [ -z "${PID}" ]; then ${BIN} ${PARAMS} & - if ! pidof -o %PPID "${BIN}" >/dev/null 2>&1; then + if ! pidof "${BIN}" >/dev/null 2>&1; then exit 2 fi exit 0 @@ -43,26 +43,20 @@ case $1 in -k) if [ -z "${PID}" ]; then exit 1 else - kill "${PID}" >/dev/null 2>&1 - if ps -ef | awk '{print $2}' | grep "${PID}" \ - >/dev/null 2>&1; then - kill -9 "${PID}" >/dev/null 2>&1 || exit 2 - else - exit 1 + pkill "${BIN}" >/dev/null 2>&1 + if pidof "${BIN}" >/dev/null 2>&1; then + pkill -9 "${BIN}" >/dev/null 2>&1 || exit 2 fi - exit 0 fi;; -r) if [ -n "${PID}" ]; then - kill "${PID}" >/dev/null 2>&1 - if ps -ef | awk '{print $2}' | grep "${PID}" \ - >/dev/null 2>&1; then - kill -9 "${PID}" >/dev/null 2>&1 || exit 2 + pkill "${BIN}" >/dev/null 2>&1 + if pidof "${BIN}" >/dev/null 2>&1; then + pkill -9 "${BIN}" >/dev/null 2>&1 || exit 2 fi fi ${BIN} ${PARAMS} & - if ! pidof -o %PPID "${BIN}" >/dev/null 2>&1; then + if ! pidof "${BIN}" >/dev/null 2>&1; then exit 2 - fi - exit 0;; + fi;; *) exit 2;; esac