jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-25 20:03:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix shellcheck warning

Browse source
This commit is contained in:
tooomm 2026-07-26 13:08:23 +02:00
parent 065924a729
commit 176914c24b
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.ci/lint_cpp.sh
View file

@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
# fetch master branch # Fetch master branch
git fetch origin master git fetch origin master
# unshallow if needed # Unshallow if needed
echo "Finding merge base" echo "Finding merge base"
if ! git merge-base origin/master HEAD; then if ! git merge-base origin/master HEAD; then
echo "Could not find merge base, unshallowing repo" echo "Could not find merge base, unshallowing repo"

5
servatrice/check_schema_version.sh
View file

@ -7,8 +7,7 @@ version_line="$(grep 'INSERT INTO cockatrice_schema_version' servatrice/servatri
version_line="${version_line#*VALUES(}" version_line="${version_line#*VALUES(}"
declare -i schema_ver="${version_line%%)*}" declare -i schema_ver="${version_line%%)*}"
# shellcheck disable=2012 latest_migration="$(printf '%s\n' servatrice/migrations/*.sql | sed 's#.*/##' | sort | tail -n1)"
latest_migration="$(ls -1 servatrice/migrations/ | tail -n1)"
xtoysql="${latest_migration#servatrice_}" xtoysql="${latest_migration#servatrice_}"
xtoy="${xtoysql%.sql}" 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 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 fi
echo " ✓ Database schema version is consistent" echo " ✓ Database schema version is consistent"
echo "::endgroup:: echo "::endgroup::"