From d483130492663aa963bea912a9d092e3b83caa8c Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Sun, 15 Nov 2020 17:57:26 -0800
Subject: [PATCH] continue removing support for the old config file

---
 bin/kaleidoscope-builder | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder
index 6bead90c..367baa64 100755
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@@ -20,17 +20,6 @@ set -e
 ######
 
 
-_read_conf_files() {
-	for conf_file in \
-		"$(pwd)/.kaleidoscope-builder.conf"; do \
-		if [ -e "${conf_file}" ]; then
-			# shellcheck disable=SC1090
-			. "${conf_file}"
-		fi
-
-	done
-}
-
 cmd_configure_arduino_cli() {
 	if [ -z "${ARDUINO_CLI}" ]; then
 		cmd_install_arduino_cli
@@ -159,18 +148,13 @@ cmd_compile() {
 
 	# This is defined in the (optional) user config.
 	# shellcheck disable=SC2154
-	${compile_HOOKS}
 
+	if [ -z ${FQBN} ]; then
 	if [ -e "${SKETCH_DIR}/.kaleidoscope-builder.conf" ]; then
-		# shellcheck disable=SC1090
-		BOARD="$(. "${SKETCH_DIR}"/.kaleidoscope-builder.conf && echo "${BOARD}")"
 		# shellcheck disable=SC1090
 		FQBN="$(. "${SKETCH_DIR}"/.kaleidoscope-builder.conf && echo "${FQBN}")"
-		if [ -n "${BOARD}" ]; then
-			: "${ARCH:=avr}"
-			FQBN="keyboardio:${ARCH}:${BOARD}"
-		fi
 	fi
+	fi 
 
 	# shellcheck disable=SC2086
 	_run_arduino_cli compile \
@@ -256,8 +240,6 @@ if [ $# -lt 1 ]; then
 	exit 1
 fi
 
-_read_conf_files
-
 # shellcheck disable=SC1090
 
 if [[ -z "${ARCH}" && -n "${FQBN}" ]]; then