From 660747c91645dc608ca0984ef73336c81fac75b5 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Thu, 15 Oct 2020 20:30:49 -0700
Subject: [PATCH] Rename ROOT to KALEIDOSCOPE_DIR, which is what it appears to
 actually be.

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

diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder
index 19c16a60..55342ed5 100755
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@@ -418,7 +418,7 @@ compile () {
 	      -tools "${ARDUINO_PATH}/tools-builder" \
 	      -fqbn "${FQBN}" \
         -libraries "." \
-        -libraries "${ROOT}" \
+        -libraries "${KALEIDOSCOPE_DIR}" \
 	      -libraries "${BOARD_HARDWARE_PATH}/.." \
         ${local_LIBS} \
 	      ${EXTRA_BUILDER_ARGS} \
@@ -656,8 +656,8 @@ fi
 ##
 ##  - if there is only one argument, that's a command
 
-ROOT="$(cd "$(dirname "$0")"/..; pwd)"
-export ROOT
+KALEIDOSCOPE_DIR="$(cd "$(dirname "$0")"/..; pwd)"
+
 # shellcheck disable=SC2155
 export SOURCEDIR="$(pwd)"
 
@@ -677,7 +677,7 @@ if [ -e "${SOURCEDIR}/kaleidoscope-builder.conf" ]; then
 fi
 
 # shellcheck disable=SC1090
-. "${ROOT}/etc/kaleidoscope-builder.conf"
+. "${KALEIDOSCOPE_DIR}/etc/kaleidoscope-builder.conf"
 
 if [ -n "${VERBOSE}" ] && [[ "${VERBOSE}" -gt 0 ]]; then
     ARDUINO_VERBOSE="-verbose"
diff --git a/etc/kaleidoscope-builder.conf b/etc/kaleidoscope-builder.conf
index 36fda7a7..e36b5b54 100644
--- a/etc/kaleidoscope-builder.conf
+++ b/etc/kaleidoscope-builder.conf
@@ -198,8 +198,6 @@ elif [ "${uname_O}" = "Cygwin" ]; then
     ARDUINO_PATH="$(realpath --relative-to=./ ${ARDUINO_PATH})"
     ARDUINO_PACKAGE_PATH="$(realpath --relative-to=./ ${ARDUINO_PACKAGE_PATH})"
     ARDUINO_LOCAL_LIB_PATH="$(realpath --relative-to=./ ${ARDUINO_LOCAL_LIB_PATH})"
-    ROOT="$(realpath --relative-to=./ ${ROOT})"
-    export ROOT
     TMPDIR="$(realpath --relative-to=./ ${ARDUINO_PATH})"
 
     find_device_port() {