From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 6 Mar 2019 11:23:19 +0000 (+0100)
Subject: Fixed execution of find command
X-Git-Tag: 465-add-subnet4-update-and-subnet6-update-commands-to-subnet-cmds-hook_base2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d4311df8f1f936256003090a179eb0762a694b4;p=thirdparty%2Fkea.git

Fixed execution of find command
---

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index faebb34369..cfad71f756 100644
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -260,7 +260,7 @@ mysql_upgrade() {
     fi
 
     # Check if there are any files in it
-    num_files=$(find ${scripts_dir}/mysql/upgrade*.sh -type f | wc -l)
+    num_files=$(find "${scripts_dir}/mysql" -name 'upgrade*.sh' -type f | wc -l)
     if [ "$num_files" -eq 0 ]; then
         log_error "No scripts in ${scripts_dir}/mysql or the directory is not readable or does not have any upgrade* scripts."
         exit 1
@@ -288,7 +288,7 @@ pgsql_upgrade() {
     fi
 
     # Check if there are any files in it
-    num_files=$(find ${scripts_dir}/pgsql/upgrade*.sh -type f | wc -l)
+    num_files=$(find "${scripts_dir}/pgsql" -name 'upgrade*.sh' -type f | wc -l)
     if [ "$num_files" -eq 0 ]; then
         log_error "No scripts in ${scripts_dir}/pgsql or the directory is not readable or does not have any upgrade* scripts."
         exit 1
@@ -326,7 +326,7 @@ cql_upgrade() {
     fi
 
     # Check if there are upgrade scripts.
-    find ${scripts_dir}/cql/upgrade*.sh -type f
+    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