From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 6 Mar 2019 10:34:41 +0000 (+0100)
Subject: Copyright headers added. Addressed 3 remaining shellcheck issues.
X-Git-Tag: 465-add-subnet4-update-and-subnet6-update-commands-to-subnet-cmds-hook_base2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6d0e6d48366abc2f69af3c6a15bc5534eaa9b88;p=thirdparty%2Fkea.git

Copyright headers added. Addressed 3 remaining shellcheck issues.
---

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 66da91a696..3072d72ee7 100644
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -213,7 +213,7 @@ cql_init() {
     # Shellcheck complaints about missing quotes and word splitting here. There
     # is no problem here as wc -w always returns a single number.
     # 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
         cql_execute_script $scripts_dir/cql/dhcpdb_create.cql
     else
diff --git a/tools/cql_config b/tools/cql_config
index 955fa983cb..fbbd9739b0 100755
--- a/tools/cql_config
+++ b/tools/cql_config
@@ -1,5 +1,15 @@
 #!/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"
 
 if test "$(uname -s)" = "Darwin"; then
@@ -13,6 +23,10 @@ then
 	echo "missing path configuration file for DataStax Cassandra (cql_config_defines.sh)"
 	exit 1
 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"
 
 if [ $# -ne 1 ] && [ $# -ne 2 ]
diff --git a/tools/sysrepo_config b/tools/sysrepo_config
index 1ec2106d98..73e5f0a2e6 100755
--- a/tools/sysrepo_config
+++ b/tools/sysrepo_config
@@ -1,5 +1,15 @@
 #!/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"
 
 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)"
     exit 0
 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 ]
 then