diff options
| author | Austin English <austinenglish@gmail.com> | 2018-10-12 17:16:23 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gmail.com> | 2018-10-13 12:53:54 -0400 |
| commit | 02af093043a7444381b0d8a0a3e8e97247505f95 (patch) | |
| tree | 9c115ea04a3a40c71cc8bf3b8c3f0bafb41533fd /sh | |
| parent | 67e2d6033dd7ac6db0269ee060ed20484825ff9f (diff) | |
misc: whitespace fixes
Diffstat (limited to 'sh')
| -rw-r--r-- | sh/rc-cgroup.sh.in | 2 | ||||
| -rw-r--r-- | sh/s6.sh | 2 | ||||
| -rw-r--r-- | sh/start-stop-daemon.sh | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sh/rc-cgroup.sh.in b/sh/rc-cgroup.sh.in index d4b68ada..79ada43f 100644 --- a/sh/rc-cgroup.sh.in +++ b/sh/rc-cgroup.sh.in @@ -62,7 +62,7 @@ cgroup_set_values() while [ -n "$1" ] && [ "$controller" != "cpuacct" ]; do case "$1" in $controller.*) - if [ -n "${name}" ] && [ -w "${cgroup}/${name}" ] && + if [ -n "${name}" ] && [ -w "${cgroup}/${name}" ] && [ -n "${val}" ]; then veinfo "$RC_SVCNAME: Setting $cgroup/$name to $val" printf "%s" "$val" > "$cgroup/$name" @@ -57,7 +57,7 @@ s6_stop() ebegin "Stopping ${name:-$RC_SVCNAME}" s6-svc -d -wD -T ${s6_service_timeout_stop:-60000} "${s6_service_link}" set -- $(s6-svstat "${s6_service_link}") - [ "$1" = "up" ] && + [ "$1" = "up" ] && yesno "${s6_force_kill:-yes}" && _s6_force_kill "$@" set -- $(s6-svstat "${s6_service_link}") diff --git a/sh/start-stop-daemon.sh b/sh/start-stop-daemon.sh index e68b47ef..2e549ae1 100644 --- a/sh/start-stop-daemon.sh +++ b/sh/start-stop-daemon.sh @@ -38,9 +38,9 @@ ssd_start() service_inactive && _inactive=true mark_service_inactive fi - [ -n "$output_logger" ] && + [ -n "$output_logger" ] && output_logger_arg="--stdout-logger \"$output_logger\"" - [ -n "$error_logger" ] && + [ -n "$error_logger" ] && error_logger_arg="--stderr-logger \"$error_logger\"" #the eval call is necessary for cases like: # command_args="this \"is a\" test" |