From: Francis Dupont <fdupont@isc.org>
Date: Mon, 8 Aug 2022 14:47:39 +0000 (+0200)
Subject: [#2071] Fixed globing vs find
X-Git-Tag: Kea-2.3.0~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e277a61fa07911250b60151fc78c5c5a7c028ce;p=thirdparty%2Fkea.git

[#2071] Fixed globing vs find
---

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index 8216bc8b17..9151fbe73a 100644
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -276,7 +276,7 @@ mysql_upgrade_schema_to_version() {
     fi
 
     # Check if there are any files in it
-    num_files=$(find ${upgrade_scripts_dir}/upgrade*.sh -type f | wc -l)
+    num_files=$(find ${upgrade_scripts_dir} -name 'upgrade*.sh' -type f | wc -l)
     if [ "${num_files}" -eq 0 ]; then
         upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql
 
diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index b9fbcb1fc3..54d8d6c285 100644
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -1118,7 +1118,7 @@ pgsql_upgrade_schema_to_version() {
     fi
 
     # Check if there are any files in it
-    num_files=$(find ${upgrade_scripts_dir}/upgrade*.sh -type f | wc -l)
+    num_files=$(find ${upgrade_scripts_dir} -name 'upgrade*.sh' -type f | wc -l)
     if [ "${num_files}" -eq 0 ]; then
         upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql