drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2022-10-05 16:55:12 +00:00
commit 86ce1d4b04
15 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
util/docker_build.sh
View file

@ -19,7 +19,7 @@ if [ $# -gt 1 ]; then
exit 1
fi
# Allow $RUNTIME to be overriden by the user as an environment variable
# 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
# if none are found error out
if [ -z "$RUNTIME" ]; then
@ -36,7 +36,7 @@ if [ -z "$RUNTIME" ]; then
exit 2
fi
fi
# Determine arguments
if [ $# -eq 0 ]; then

2
util/docker_cmd.sh
View file

@ -15,7 +15,7 @@ for arg; do
fi
done
# Allow $RUNTIME to be overriden by the user as an environment variable
# 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
# if none are found error out
if [ -z "$RUNTIME" ]; then