diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder index 8e0094ba..46b3bd71 100755 --- a/bin/kaleidoscope-builder +++ b/bin/kaleidoscope-builder @@ -259,26 +259,21 @@ check_bootloader_port_and_flash () { } flash_over_usb () { - if [ "${ARDUINO_VERBOSE}" != "-verbose" ]; then - ${AVRDUDE} \ + + FLASH_CMD=${AVRDUDE} \ -C "${AVRDUDE_CONF}" \ -p"${MCU}" \ -cavr109 \ -D \ -P "${DEVICE_PORT_BOOTLOADER}" \ -b57600 \ - "-Uflash:w:${HEX_FILE_PATH}:i" \ - 2>&1 |grep -v ^avrdude | grep -v '^$' |grep -v '^ ' | grep -vi programmer + "-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 - ${AVRDUDE} \ - -C "${AVRDUDE_CONF}" \ - -p"${MCU}" \ - -cavr109 \ - -D \ - -P "${DEVICE_PORT_BOOTLOADER}" \ - -b57600 \ - "-Uflash:w:${HEX_FILE_PATH}:i" + ${FLASH_CMD} return $? fi }