mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 22:45:18 +00:00
Code Issues Releases Wiki Activity

Removed SC2046 disables and added nested double quotes instead.

Browse Source
This commit is contained in:
Tomek Mrugalski
2019-03-06 12:09:34 +01:00
committed by Tomek Mrugalski
parent 6cb34f89ec
commit 68b9a89ccd
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/keactrl/keactrl.in
View File

@@ -56,13 +56,8 @@ is_in_list() {
# Prints keactrl usage. # Prints keactrl usage.
usage() { usage() {
# Shellcheck is too picky about this. This will work as long as keactrl
# script is not renamed to something with spaces or installed into a dir
# with spaces.
#
#shellcheck disable=SC2086
printf "usage is %s command [-c keactrl-config-file] [-s server[,server,..]]\n" \ printf "usage is %s command [-c keactrl-config-file] [-s server[,server,..]]\n" \
"$(basename -- ${0})" "$(basename -- "${0}")"
printf "commands: start stop reload status version\n" printf "commands: start stop reload status version\n"
} }
@@ -517,32 +512,31 @@ ${args}" 1
status) status)
kea4_status="inactive" kea4_status="inactive"
#shellcheck disable=SC2046 # This case of nested double quotes looks confusing, but it is actually
check_running $(basename -- "${dhcp4_srv}") # correct. For details, see this fine explanation:
# https://unix.stackexchange.com/questions/443989/whats-the-right-way-to-quote-command-arg
check_running "$(basename -- "${dhcp4_srv}")"
if [ ${_running} -eq 1 ]; then if [ ${_running} -eq 1 ]; then
kea4_status="active" kea4_status="active"
fi fi
printf "DHCPv4 server: %s\n" "${kea4_status}" printf "DHCPv4 server: %s\n" "${kea4_status}"
kea6_status="inactive" kea6_status="inactive"
#shellcheck disable=SC2046 check_running "$(basename -- "${dhcp6_srv}")"
check_running $(basename -- "${dhcp6_srv}")
if [ ${_running} -eq 1 ]; then if [ ${_running} -eq 1 ]; then
kea6_status="active" kea6_status="active"
fi fi
printf "DHCPv6 server: %s\n" "${kea6_status}" printf "DHCPv6 server: %s\n" "${kea6_status}"
d2_status="inactive" d2_status="inactive"
#shellcheck disable=SC2046 check_running "$(basename -- "${dhcp_ddns_srv}")"
check_running $(basename -- "${dhcp_ddns_srv}")
if [ ${_running} -eq 1 ]; then if [ ${_running} -eq 1 ]; then
d2_status="active" d2_status="active"
fi fi
printf "DHCP DDNS: %s\n" "${d2_status}" printf "DHCP DDNS: %s\n" "${d2_status}"
agent_status="inactive" agent_status="inactive"
#shellcheck disable=SC2046 check_running "$(basename -- "${ctrl_agent_srv}")"
check_running $(basename -- "${ctrl_agent_srv}")
if [ ${_running} -eq 1 ]; then if [ ${_running} -eq 1 ]; then
agent_status="active" agent_status="active"
fi fi
@@ -550,8 +544,7 @@ ${args}" 1
if [ "${have_netconf}" -eq 1 ]; then if [ "${have_netconf}" -eq 1 ]; then
netconf_status="inactive" netconf_status="inactive"
#shellcheck disable=SC2046 check_running "$(basename -- "${netconf_srv}")"
check_running $(basename -- "${netconf_srv}")
if [ "${_running}" -eq 1 ]; then if [ "${_running}" -eq 1 ]; then
netconf_status="active" netconf_status="active"
fi fi