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

This commit is contained in:
QMK Bot 2021-08-10 23:56:43 +00:00
commit 80cb96bb15

View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
QMK_FIRMWARE_DIR=$(cd -P -- "$(dirname -- "$0")/.." && pwd -P) QMK_FIRMWARE_DIR=$(cd -P -- "$(dirname -- "$0")/.." >/dev/null && pwd -P)
QMK_FIRMWARE_UTIL_DIR=$QMK_FIRMWARE_DIR/util QMK_FIRMWARE_UTIL_DIR=$QMK_FIRMWARE_DIR/util
if [ "$1" = "-y" ]; then if [ "$1" = "-y" ]; then
SKIP_PROMPT='-y' SKIP_PROMPT='-y'