From 754161cf9489ba7d480c61f4198a070ecdb7450a Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Sat, 14 Nov 2020 19:42:33 -0800 Subject: [PATCH] move --verbose setting into the makefile --- bin/kaleidoscope-builder | 7 ------- etc/sketch-arduino-cli.mk | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index 6b67b178..e21f9afe 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -169,7 +169,6 @@ _find_sketch() { exit 1 } -} cmd_flash() { @@ -329,12 +328,6 @@ _read_conf_files # shellcheck disable=SC1090 -if [ -n "${VERBOSE}" ] && [[ "${VERBOSE}" -gt 0 ]]; then - ARDUINO_VERBOSE="--verbose" -else - ARDUINO_VERBOSE="" -fi - if [[ -z "${ARCH}" && -n "${FQBN}" ]]; then ARCH=$(echo "${FQBN}" | sed -n -e 's/^[^:]\+:\([^:]\+\).*/\1/p') fi diff --git a/etc/sketch-arduino-cli.mk b/etc/sketch-arduino-cli.mk index 857927fa..876500b6 100644 --- a/etc/sketch-arduino-cli.mk +++ b/etc/sketch-arduino-cli.mk @@ -19,6 +19,12 @@ else export ARDUINO_CLI ?= $(system_arduino_cli) endif +ifneq ($(VERBOSE),) +export ARDUINO_VERBOSE ?= --verbose +else +export ARDUINO_VERBOSE ?= +endif + .DEFAULT_GOAL := compile all: