From 955c0a20436bf0f4c327e811adff0e6df55f6651 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Sat, 14 Nov 2020 18:45:10 -0800
Subject: [PATCH] Move core installation to the makefile

---
 bin/kaleidoscope-builder  | 8 --------
 etc/sketch-arduino-cli.mk | 5 +++++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder
index 81d4fb53..2d757817 100755
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@@ -42,14 +42,6 @@ cmd_configure_arduino_cli() {
 	fi
 }
 
-cmd_install_arduino_core_kaleidoscope() {
-	_run_arduino_cli core install "keyboardio:avr"
-}
-
-cmd_install_arduino_core_avr() {
-	_run_arduino_cli core install "arduino:avr"
-}
-
 _run_arduino_cli() {
 	"${ARDUINO_CLI}" "$@"
 }
diff --git a/etc/sketch-arduino-cli.mk b/etc/sketch-arduino-cli.mk
index 8069da2c..857927fa 100644
--- a/etc/sketch-arduino-cli.mk
+++ b/etc/sketch-arduino-cli.mk
@@ -30,6 +30,11 @@ install-arduino-cli:
 	curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR="$(KALEIDOSCOPE_BIN_DIR)" sh
 
 
+install-arduino-core-kaleidoscope:
+	$(ARDUINO_CLI) core install "keyboardio:avr"
+
+install-arduino-core-avr: 
+	$(ARDUINO_CLI) core install "arduino:avr"
 
 decompile: disassemble
 	@: ## Do not remove this line, otherwise `make all` will trigger the `%` rule too.