Next attempt to determine mysql command name

mstilkerich · mstilkerich · commit 76a92defface · 2024-06-05T17:46:54.000+02:00
Newer versions of mysql docker image do not include the which command
diff --git a/Makefile b/Makefile
@@ -38,8 +38,8 @@ RELEASE_VERSION ?= $(shell git tag --points-at HEAD)
 # The following environment variables are assumed for MYSQL:
 #   - MYSQL_PASSWORD: Password of the MySQL root user
 #   - MYSQL_CMD_PREFIX: Prefix to use for all mysql commands (intended use: docker exec)
-MYSQLCMD := $(shell $(MYSQL_CMD_PREFIX) sh -c 'which mariadb mysql | head -n 1')
-MYSQLDUMPCMD := $(shell $(MYSQL_CMD_PREFIX) sh -c 'which mariadb-dump mysqldump | head -n 1')
+MYSQLCMD := $(shell $(MYSQL_CMD_PREFIX) sh -c 'find /usr/bin -name mariadb -o -name mysql | head -n 1')
+MYSQLDUMPCMD := $(shell $(MYSQL_CMD_PREFIX) sh -c 'find /usr/bin -name mariadb-dump -o -name mysqldump | head -n 1')
 MYSQL     := $(MYSQL_CMD_PREFIX) $(MYSQLCMD) -u root -p"$$MYSQL_PASSWORD"
 MYSQLDUMP := $(MYSQL_CMD_PREFIX) $(MYSQLDUMP) -u root -p"$$MYSQL_PASSWORD"
 
