diff options
| author | QMK Bot <hello@qmk.fm> | 2021-08-10 23:56:43 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-08-10 23:56:43 +0000 |
| commit | 80cb96bb15d71463a49b545347344be40fd88932 (patch) | |
| tree | 66e84f671b1c25f2d17ace5953140ecdb2c56260 /util | |
| parent | 8d1255ccab40eb3bff00fd24079bf92d73687e87 (diff) | |
| parent | 817fcfdc9a146f949e1edeba088866eff8cbcde2 (diff) | |
| download | qmk_firmware-80cb96bb15d71463a49b545347344be40fd88932.tar.gz qmk_firmware-80cb96bb15d71463a49b545347344be40fd88932.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'util')
| -rwxr-xr-x | util/qmk_install.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/qmk_install.sh b/util/qmk_install.sh index 06eb4f022..5f22ba0ad 100755 --- a/util/qmk_install.sh +++ b/util/qmk_install.sh | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #!/usr/bin/env bash | 1 | #!/usr/bin/env bash |
| 2 | 2 | ||
| 3 | QMK_FIRMWARE_DIR=$(cd -P -- "$(dirname -- "$0")/.." && pwd -P) | 3 | QMK_FIRMWARE_DIR=$(cd -P -- "$(dirname -- "$0")/.." >/dev/null && pwd -P) |
| 4 | QMK_FIRMWARE_UTIL_DIR=$QMK_FIRMWARE_DIR/util | 4 | QMK_FIRMWARE_UTIL_DIR=$QMK_FIRMWARE_DIR/util |
| 5 | if [ "$1" = "-y" ]; then | 5 | if [ "$1" = "-y" ]; then |
| 6 | SKIP_PROMPT='-y' | 6 | SKIP_PROMPT='-y' |