From 5a02cc00a43cbeb9cc6ad94811acfb861d8f3929 Mon Sep 17 00:00:00 2001 From: shela Date: Fri, 10 Jan 2020 09:44:16 +0900 Subject: [PATCH] Fix docker script and document (#7786) Fixed error when keyboard parameter is omitted in interactive mode. --- docs/getting_started_build_tools.md | 4 ++-- util/docker_build.sh | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/getting_started_build_tools.md b/docs/getting_started_build_tools.md index 95f17e4b2ecc3d8f4fe77d914df401b60c3afb5c..fea20e59b4dd011869398bdc567979197b3a3b6e 100644 --- a/docs/getting_started_build_tools.md +++ b/docs/getting_started_build_tools.md @@ -120,12 +120,12 @@ If this is a bit complex for you, Docker might be the turnkey solution you need. util/docker_build.sh keyboard:keymap # For example: util/docker_build.sh ergodox_ez:steno ``` -This will compile the desired keyboard/keymap and leave the resulting `.hex` or `.bin` file in the QMK directory for you to flash. If `:keymap` is omitted, the `default` keymap is used. Note that the parameter format is the same as when building with `make`. +This will compile the desired keyboard/keymap and leave the resulting `.hex` or `.bin` file in the QMK directory for you to flash. If `:keymap` is omitted, all keymaps are used. Note that the parameter format is the same as when building with `make`. You can also start the script without any parameters, in which case it will ask you to input the build parameters one by one, which you may find easier to use: ```bash util/docker_build.sh -# Reads parameters as input (leave blank for defaults) +# Reads parameters as input (leave blank for all keyboards/keymaps) ``` There is also support for building _and_ flashing the keyboard straight from Docker by specifying the `target` as well: diff --git a/util/docker_build.sh b/util/docker_build.sh index d8c4c759a346b9343ec304f243544145e74e19a2..bf13f50975489ebeb749e8aba51c47ec8647965d 100755 --- a/util/docker_build.sh +++ b/util/docker_build.sh @@ -37,6 +37,9 @@ else exit 1 fi fi +if [ -z "$keyboard" ]; then + keyboard=all +fi if [ -n "$target" ]; then if [ "$(uname)" = "Linux" ] || docker-machine active >/dev/null 2>&1; then usb_args="--privileged -v /dev:/dev"