From 9170aa51fd4e8336cc34db3a1aa29989a024b50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 23 Oct 2017 23:20:31 +0300
Subject: Avoid some unnecessary stat calls

---
 service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'service')

diff --git a/service b/service
index 9b25e85d..f3c524ae 100755
--- a/service
+++ b/service
@@ -79,7 +79,7 @@ if [ -f "${SERVICEDIR}/${SERVICE}" ]; then
        /bin/systemctl stop ${SERVICE}.service
    fi
    env -i PATH="$PATH" TERM="$TERM" SYSTEMCTL_IGNORE_DEPENDENCIES=${SYSTEMCTL_IGNORE_DEPENDENCIES} SYSTEMCTL_SKIP_REDIRECT=${SYSTEMCTL_SKIP_REDIRECT} "${SERVICEDIR}/${SERVICE}" ${ACTION} ${OPTIONS}
-elif [ -x "${ACTIONDIR}/${SERVICE}/${ACTION}" -a -n "${ACTION}" ]; then
+elif [ -n "${ACTION}" ] && [ -x "${ACTIONDIR}/${SERVICE}/${ACTION}" ]; then
    env -i PATH="$PATH" TERM="$TERM" SYSTEMCTL_IGNORE_DEPENDENCIES=${SYSTEMCTL_IGNORE_DEPENDENCIES} SYSTEMCTL_SKIP_REDIRECT=${SYSTEMCTL_SKIP_REDIRECT} "${ACTIONDIR}/${SERVICE}/${ACTION}" ${OPTIONS}
 elif `echo $ACTION | egrep -qw "start|stop|restart|try-restart|reload|force-reload|status|condrestart"` ; then
    SERVICE_MANGLED=$(/usr/bin/systemd-escape --mangle ${SERVICE})
-- 
cgit v1.2.1