mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-02 15:05:16 +00:00
Code Issues Releases Wiki Activity

Copyright headers added. Addressed 3 remaining shellcheck issues.

Browse Source
This commit is contained in:
Tomek Mrugalski
2019-03-06 11:34:41 +01:00
committed by Tomek Mrugalski
parent 5bc2811a55
commit d6d0e6d483
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/admin/kea-admin.in
View File

@@ -213,7 +213,7 @@ cql_init() {
# Shellcheck complaints about missing quotes and word splitting here. There # Shellcheck complaints about missing quotes and word splitting here. There
# is no problem here as wc -w always returns a single number. # is no problem here as wc -w always returns a single number.
# shellcheck disable=SC2046 # shellcheck disable=SC2046
if [ $(echo "$result" | grep "<empty>" | wc -w) -gt 0 ]; then if [ $(echo "$result" | grep -c "<empty>") -gt 0 ]; then
printf "Creating and initializing tables using script %s...\n" $scripts_dir/cql/dhcpdb_create.cql printf "Creating and initializing tables using script %s...\n" $scripts_dir/cql/dhcpdb_create.cql
cql_execute_script $scripts_dir/cql/dhcpdb_create.cql cql_execute_script $scripts_dir/cql/dhcpdb_create.cql
else else

14
tools/cql_config
View File

@@ -1,5 +1,15 @@
#!/bin/sh #!/bin/sh
# Copyright (C) 2016-2019 Internet Systems Consortium, Inc. ("ISC")
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# This is keactrl script responsible for starting up Kea processes.
# This script is used to run Kea from installation directory,
# as well as for running tests.
cql_lib="cassandra" cql_lib="cassandra"
if test "$(uname -s)" = "Darwin"; then if test "$(uname -s)" = "Darwin"; then
@@ -13,6 +23,10 @@ then
echo "missing path configuration file for DataStax Cassandra (cql_config_defines.sh)" echo "missing path configuration file for DataStax Cassandra (cql_config_defines.sh)"
exit 1 exit 1
fi fi
# Shellcheck tries to follow this link and gets confused about not being able
# to find the file.
# shellcheck disable=SC1090
source "${DIR}/cql_config_defines.sh" source "${DIR}/cql_config_defines.sh"
if [ $# -ne 1 ] && [ $# -ne 2 ] if [ $# -ne 1 ] && [ $# -ne 2 ]

16
tools/sysrepo_config
View File

@@ -1,5 +1,15 @@
#!/bin/bash #!/bin/bash
# Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC")
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# This is keactrl script responsible for starting up Kea processes.
# This script is used to run Kea from installation directory,
# as well as for running tests.
sysrepo_lib="libsysrepo" sysrepo_lib="libsysrepo"
if [ -z "${YANG_LIBRARY_PATH}" ] if [ -z "${YANG_LIBRARY_PATH}" ]
@@ -17,7 +27,11 @@ if ! [ -f "${DIR}/sysrepo_config_defines.sh" ] || ! [ -x "${DIR}/sysrepo_config_
echo "missing path configuration file for Sysrepo (sysrepo_config_defines.sh)" echo "missing path configuration file for Sysrepo (sysrepo_config_defines.sh)"
exit 0 exit 0
fi fi
source ${DIR}/sysrepo_config_defines.sh
# Shellcheck tries to follow this link and gets confused about not being able
# to find the file.
# shellcheck disable=SC1090
source "${DIR}/sysrepo_config_defines.sh"
if [ $# -ne 1 ] && [ $# -ne 2 ] if [ $# -ne 1 ] && [ $# -ne 2 ]
then then