From b8f86edffd5978020e85800ca33559a2d0bdcfe9 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Sat, 14 Nov 2020 18:08:05 -0800
Subject: [PATCH] now that we're exporting these, we don't need to explicitly
 add them on the commandline

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

diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder
index f3f52849..1eed63ff 100755
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@@ -73,11 +73,7 @@ cmd_install_arduino_core_avr() {
 }
 
 _run_arduino_cli() {
-	ARDUINO_DIRECTORIES_USER=${ARDUINO_DIRECTORIES_USER} \
-		ARDUINO_DIRECTORIES_DATA=${ARDUINO_DIRECTORIES_DATA} \
-		ARDUINO_DIRECTORIES_DOWNLOADS=${ARDUINO_DIRECTORIES_DOWNLOADS} \
-		ARDUINO_BOARD_MANAGER_ADDITIONAL_URLS=${ARDUINO_BOARDS_MANAGER_KALEIDOSCOPE} \
-		"${ARDUINO_CLI}" "$@"
+	"${ARDUINO_CLI}" "$@"
 }
 
 
diff --git a/etc/sketch-arduino-cli.mk b/etc/sketch-arduino-cli.mk
index ae3a9bad..b8a48525 100644
--- a/etc/sketch-arduino-cli.mk
+++ b/etc/sketch-arduino-cli.mk
@@ -9,7 +9,7 @@ export ARDUINO_DIRECTORIES_DATA ?= $(ARDUINO_CONTENT)/data
 export ARDUINO_DIRECTORIES_DOWNLOADS ?= $(ARDUINO_CONTENT)/downloads
 export ARDUINO_DIRECTORIES_USER ?= $(ARDUINO_CONTENT)/user
 export ARDUINO_CLI_CONFIG ?= $(ARDUINO_DIRECTORIES_DATA)/arduino-cli.yaml
-export ARDUINO_BOARDS_MANAGER_KALEIDOSCOPE ?= https://raw.githubusercontent.com/keyboardio/boardsmanager/master/package_keyboardio_index.json
+export ARDUINO_BOARD_MANAGER_ADDITIONAL_URLS ?= https://raw.githubusercontent.com/keyboardio/boardsmanager/master/package_keyboardio_index.json