From 2ed07d382d8c1d63090cf4d40f43a90d19648345 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Sat, 14 Nov 2020 18:25:15 -0800 Subject: [PATCH] Move installation of the arduino cli into the makefile --- bin/kaleidoscope-builder | 5 ----- etc/sketch-arduino-cli.mk | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index 31ab3daa..aee5fbb2 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -43,11 +43,6 @@ _configure_arduino_cli_env() { } -cmd_install_arduino_cli() { - # todo cd to kaleidoscope dir - curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | sh -} - cmd_configure_arduino_cli() { if [ -z "${ARDUINO_CLI}" ]; then cmd_install_arduino_cli diff --git a/etc/sketch-arduino-cli.mk b/etc/sketch-arduino-cli.mk index b8a48525..c078d530 100644 --- a/etc/sketch-arduino-cli.mk +++ b/etc/sketch-arduino-cli.mk @@ -20,6 +20,12 @@ all: @echo "Make all target doesn't do anything" @: ## Do not remove this line, otherwise `make all` will trigger the `%` rule too. + +install-arduino-cli: + curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR="$(KALEIDOSCOPE_BIN_DIR)" sh + + + decompile: disassemble @: ## Do not remove this line, otherwise `make all` will trigger the `%` rule too.