From 438b9215ef2ec244938640e69720b17d7c3553d4 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Fri, 23 Oct 2020 18:45:02 -0700
Subject: [PATCH] refactor a bit to reduce duplication in recipe names

---
 bin/kaleidoscope-builder | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder
index 2d49745d..9323558d 100755
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@@ -335,23 +335,6 @@ check_bootloader_port_and_flash () {
     return 0
 }
 
-flash_over_usb () {
-    FLASH_CMD=$(${AVRDUDE} \
-		-C "${AVRDUDE_CONF}" \
-		-p"$(get_arduino_pref 'build.mcu')" \
- 		-cavr109 \
-		-D \
-		-P "${DEVICE_PORT_BOOTLOADER}" \
-		-b57600 \
-		"-Uflash:w:${HEX_FILE_PATH}:i")
-    if [ "${ARDUINO_VERBOSE}" != "--verbose" ]; then
-	${FLASH_CMD} 2>&1 |grep -v ^avrdude | grep -v '^$' |grep -v '^ ' | grep -vi programmer
-    	return "${PIPESTATUS[0]}"
-    else
-        ${FLASH_CMD}
-	return $?
-    fi
-}
 
 flash_from_bootloader() {
     compile "$@"
@@ -367,20 +350,29 @@ program() {
 }
 
 flash_with_programmer() {
-    ${AVRDUDE} -v \
-	       -C "${AVRDUDE_CONF}" \
-	       -p"$(get_arduino_pref 'build.mcu')" \
+	set_executable_paths
+	${AVRDUDE_CMD}
 	       -cusbtiny \
-	       -D \
 	       -B 1 \
 	       "-Uflash:w:${HEX_FILE_PATH}:i"
 }
 
-find_bootloader_path() {
-    : "${BOOTLOADER_PATH:=$( get_arduino_pref 'runtime.platform.path' )/bootloaders/$( get_arduino_pref 'bootloader.file' )}"
+flash_over_usb () {
+    set_executable_paths
+    FLASH_CMD=$( ${AVRDUDE_CMD}
+ 		-cavr109 \
+		-P "${DEVICE_PORT_BOOTLOADER}" \
+		-b57600 \
+		"-Uflash:w:${HEX_FILE_PATH}:i")
+    if [ "${ARDUINO_VERBOSE}" != "--verbose" ]; then
+	${FLASH_CMD} 2>&1 |grep -v ^avrdude | grep -v '^$' |grep -v '^ ' | grep -vi programmer
+    	return "${PIPESTATUS[0]}"
+    else
+        ${FLASH_CMD}
+	return $?
+    fi
 }
 
-
 hex_with_bootloader () {
     compile