From 176914c24b38baeb6d0f1ebb0bde4c6a5244a654 Mon Sep 17 00:00:00 2001 From: tooomm Date: Sun, 26 Jul 2026 13:08:23 +0200 Subject: [PATCH] fix shellcheck warning --- .ci/lint_cpp.sh | 4 ++-- servatrice/check_schema_version.sh | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.ci/lint_cpp.sh b/.ci/lint_cpp.sh index 9786a83fc..c28329dbe 100755 --- a/.ci/lint_cpp.sh +++ b/.ci/lint_cpp.sh @@ -1,9 +1,9 @@ #!/bin/bash -# fetch master branch +# Fetch master branch git fetch origin master -# unshallow if needed +# Unshallow if needed echo "Finding merge base" if ! git merge-base origin/master HEAD; then echo "Could not find merge base, unshallowing repo" diff --git a/servatrice/check_schema_version.sh b/servatrice/check_schema_version.sh index 75d44b826..13c5f77f8 100755 --- a/servatrice/check_schema_version.sh +++ b/servatrice/check_schema_version.sh @@ -7,8 +7,7 @@ version_line="$(grep 'INSERT INTO cockatrice_schema_version' servatrice/servatri version_line="${version_line#*VALUES(}" declare -i schema_ver="${version_line%%)*}" -# shellcheck disable=2012 -latest_migration="$(ls -1 servatrice/migrations/ | tail -n1)" +latest_migration="$(printf '%s\n' servatrice/migrations/*.sql | sed 's#.*/##' | sort | tail -n1)" xtoysql="${latest_migration#servatrice_}" xtoy="${xtoysql%.sql}" declare -i old_ver="10#${xtoy%_to_*}" # declare as integer with base 10, numbers with a leading 0 are normally interpreted as base 16 @@ -40,4 +39,4 @@ if ! grep -q "$expected_define" servatrice/src/servatrice_database_interface.h; fi echo " ✓ Database schema version is consistent" -echo "::endgroup:: +echo "::endgroup::"