sys-process/fcron: runscript: Make shellcheck happy
authorThomas Deutschmann <whissi@gentoo.org>
Sat, 19 Nov 2016 20:48:49 +0000 (21:48 +0100)
committerThomas Deutschmann <whissi@gentoo.org>
Sat, 19 Nov 2016 20:49:15 +0000 (21:49 +0100)
Further POSIX improvements.

Package-Manager: portage-2.3.2

sys-process/fcron/files/fcron.init.4

index 25fafc16ec259e0ed7e6d8d68caa6d920a0b6d32..9b7765fbfd69a94cf9e9b0a60f87e052b3092828 100644 (file)
@@ -5,7 +5,7 @@
 
 FCRON_INSTANCE="${SVCNAME##*.}"
 
-if [ -n "${FCRON_INSTANCE}" -a "${SVCNAME}" != "fcron" ]; then
+if [ -n "${FCRON_INSTANCE}" ] && [ "${SVCNAME}" != "fcron" ]; then
        FCRON_CONFIGFILE="/etc/fcron/fcron.${FCRON_INSTANCE}.conf"
 else
        FCRON_CONFIGFILE="/etc/fcron/fcron.conf"
@@ -17,10 +17,10 @@ getconfig() {
        local value=
 
        if service_started; then
-               value="$(service_get_value ${key})"
+               value="$(service_get_value "${key}")"
        fi
 
-       if [ -z "${value}" -a -r "${FCRON_CONFIGFILE}" ]; then
+       if [ -z "${value}" ] && [ -r "${FCRON_CONFIGFILE}" ]; then
                value="$(sed -n -e 's:^'"${key}"'[ \t]*=[ \t]*::p' "${FCRON_CONFIGFILE}")"
        fi