Move setting ARDUINO_CLI to the makefile

tmp/arduino-cli-pre-rebase
Jesse Vincent 4 years ago
parent 2ed07d382d
commit 84576b10d4
No known key found for this signature in database
GPG Key ID: CC228463465E40BC

@ -32,16 +32,6 @@ _read_conf_files() {
done
}
_configure_arduino_cli_env() {
system_arduino_cli="$(command -v arduino-cli || true)"
if [ -z "${system_arduino_cli}" ]; then
: "${ARDUINO_CLI:=${KALEIDOSCOPE_BIN_DIR}/arduino-cli}"
else
: "${ARDUINO_CLI:=${system_arduino_cli}}"
fi
}
cmd_configure_arduino_cli() {
if [ -z "${ARDUINO_CLI}" ]; then
@ -344,7 +334,6 @@ if [ $# -lt 1 ]; then
fi
_read_conf_files
_configure_arduino_cli_env
# shellcheck disable=SC1090

@ -11,8 +11,13 @@ export ARDUINO_DIRECTORIES_USER ?= $(ARDUINO_CONTENT)/user
export ARDUINO_CLI_CONFIG ?= $(ARDUINO_DIRECTORIES_DATA)/arduino-cli.yaml
export ARDUINO_BOARD_MANAGER_ADDITIONAL_URLS ?= https://raw.githubusercontent.com/keyboardio/boardsmanager/master/package_keyboardio_index.json
system_arduino_cli=$(command -v arduino-cli || true)
ifeq ($(system_arduino_cli),)
export ARDUINO_CLI ?= $(KALEIDOSCOPE_BIN_DIR)/arduino-cli
else
export ARDUINO_CLI ?= $(system_arduino_cli)
endif
.DEFAULT_GOAL := compile

Loading…
Cancel
Save