diff options
author | QMK Bot <hello@qmk.fm> | 2022-10-05 16:55:12 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-10-05 16:55:12 +0000 |
commit | 86ce1d4b04031174b3eca666fbee5f7c9c706ab2 (patch) | |
tree | 1893ffaa3f6096e3a07d8cf971c14880db7e82bf /util | |
parent | d1b6b062024dddf047f760efbad21edb2acca394 (diff) | |
parent | 959f4cbb621868a4f0c1701f54ad2a1f45d889af (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'util')
-rwxr-xr-x | util/docker_build.sh | 4 | ||||
-rwxr-xr-x | util/docker_cmd.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/util/docker_build.sh b/util/docker_build.sh index 8a6b2d0565..7e10a4f76b 100755 --- a/util/docker_build.sh +++ b/util/docker_build.sh @@ -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 diff --git a/util/docker_cmd.sh b/util/docker_cmd.sh index 2ea113d24a..f3c4c7804f 100755 --- a/util/docker_cmd.sh +++ b/util/docker_cmd.sh @@ -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 |