From: Francis Dupont <fdupont@isc.org>
Date: Wed, 6 Mar 2019 12:10:54 +0000 (+0100)
Subject: [480-shellcheck] Addressed SC2231 extra warnings
X-Git-Tag: 465-add-subnet4-update-and-subnet6-update-commands-to-subnet-cmds-hook_base2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8818ba0260ba36710b88db6401069f9fe4f3a73a;p=thirdparty%2Fkea.git

[480-shellcheck] Addressed SC2231 extra warnings
---

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index cfad71f756..98785be2f8 100644
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -266,7 +266,7 @@ mysql_upgrade() {
         exit 1
     fi
 
-    for script in ${scripts_dir}/mysql/upgrade*.sh
+    for script in "${scripts_dir}"/mysql/upgrade*.sh
     do
         echo "Processing $script file..."
         sh "${script}" --host="${db_host}" --user="${db_user}" --password="${db_password}" "${db_name}"
@@ -298,7 +298,7 @@ pgsql_upgrade() {
     # thru an env
     export PGPASSWORD=$db_password
 
-    for script in ${scripts_dir}/pgsql/upgrade*.sh
+    for script in "${scripts_dir}"/pgsql/upgrade*.sh
     do
         echo "Processing $script file..."
         sh "${script}" -U "${db_user}" -h "${db_host}" -d "${db_name}"
@@ -329,7 +329,7 @@ cql_upgrade() {
     find "${scripts_dir}/cql" -name 'upgrade*.sh' -type f
     retcode=$?
     if [ $retcode -eq 0 ]; then # Upgrade scripts are present.
-        for script in ${scripts_dir}/cql/upgrade*.sh
+        for script in "${scripts_dir}"/cql/upgrade*.sh
         do
             echo "Processing $script file..."
             sh "${script}" -u "${db_user}" -p "${db_password}" -k "${db_name}"