~ruther/qmk_firmware

3f2cbc9e68fa026ac14471e4ef15c9c349d78f38 — Renegade-Master 2 years ago 9c02b29
Pr/reorder docker podman check (#19561)

2 files changed, 8 insertions(+), 8 deletions(-)

M util/docker_build.sh
M util/docker_cmd.sh
M util/docker_build.sh => util/docker_build.sh +4 -4
@@ 20,13 20,13 @@ if [ $# -gt 1 ]; then
fi

# Allow $RUNTIME to be overridden by the user as an environment variable
# Else check if either docker or podman exit and set them as runtime
# Else check if either podman or docker exit and set them as runtime
# if none are found error out
if [ -z "$RUNTIME" ]; then
	if command -v docker >/dev/null 2>&1; then
		RUNTIME="docker"
	elif command -v podman >/dev/null 2>&1; then
	if command -v podman >/dev/null 2>&1; then
		RUNTIME="podman"
	elif command -v docker >/dev/null 2>&1; then
		RUNTIME="docker"
	else
		errcho "Error: no compatible container runtime found."
		errcho "Either podman or docker are required."

M util/docker_cmd.sh => util/docker_cmd.sh +4 -4
@@ 16,13 16,13 @@ for arg; do
done

# Allow $RUNTIME to be overridden by the user as an environment variable
# Else check if either docker or podman exit and set them as runtime
# Else check if either podman or docker exit and set them as runtime
# if none are found error out
if [ -z "$RUNTIME" ]; then
	if command -v docker >/dev/null 2>&1; then
		RUNTIME="docker"
	elif command -v podman >/dev/null 2>&1; then
	if command -v podman >/dev/null 2>&1; then
		RUNTIME="podman"
	elif command -v docker >/dev/null 2>&1; then
		RUNTIME="docker"
	else
		errcho "Error: no compatible container runtime found."
		errcho "Either podman or docker are required."