From de45646c9d490bc497f9011c9967b89260030eff Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Sat, 17 Oct 2020 17:01:41 -0700
Subject: [PATCH] extract out a variable for ARDUINO_BUILDER_TOOLS_PATH to make
 it easier to get up and running on arch

---
 bin/kaleidoscope-builder      | 2 +-
 etc/kaleidoscope-builder.conf | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder
index 26fbd174..14878f7d 100755
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@@ -405,7 +405,7 @@ do_compile () {
 	      -hardware "${ARDUINO_PATH}/hardware" \
 	      -hardware "${BOARD_HARDWARE_PATH}" \
 	      ${ARDUINO_TOOLS_FLAG:+"${ARDUINO_TOOLS_FLAG}"} ${ARDUINO_TOOLS_PARAM:+"${ARDUINO_TOOLS_PARAM}"} \
-	      -tools "${ARDUINO_PATH}/tools-builder" \
+	      -tools "${ARDUINO_BUILDER_TOOLS_PATH}" \
 	      -fqbn "${FQBN}" \
         -libraries "." \
         -libraries "${KALEIDOSCOPE_DIR}" \
diff --git a/etc/kaleidoscope-builder.conf b/etc/kaleidoscope-builder.conf
index d66716aa..d3fb5856 100644
--- a/etc/kaleidoscope-builder.conf
+++ b/etc/kaleidoscope-builder.conf
@@ -69,7 +69,7 @@ dump_arduino_prefs() {
 		-hardware "${ARDUINO_PATH}/hardware" \
 		-hardware "${BOARD_HARDWARE_PATH}" \
 		${ARDUINO_TOOLS_FLAG:+"${ARDUINO_TOOLS_FLAG}"} ${ARDUINO_TOOLS_PARAM:+"${ARDUINO_TOOLS_PARAM}"} \
-		-tools "${ARDUINO_PATH}/tools-builder" \
+		-tools "${ARDUINO_BUILDER_TOOLS_PATH}" \
 		-fqbn "${FQBN}" \
 	 	-build-path "${ARDUINO_PATH}" \
    		-dump-prefs  "${SKETCH_DIR}/${SKETCH}.ino" )
@@ -224,6 +224,7 @@ fi
 : "${ARDUINO_PACKAGE_PATH:=${HOME}/.arduino15/packages}"
 
 : "${ARDUINO_BUILDER:=${ARDUINO_PATH}/arduino-builder}"
+: "${ARDUINO_BUILDER_TOOLS_PATH}:=${ARDUINO_PATH}/tools-builder"
 ARDUINO_IDE_VERSION="10607"
 
 ######