1 files changed, 10 insertions, 10 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index ccecdb192..a36d219dd 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -115,11 +115,11 @@ dfu: $(BUILD_DIR)/$(TARGET).hex sizeafter
                echo "Error: Bootloader not found. Trying again in 5s." ;\
                sleep 5 ;\
        done
-ifneq (, $(findstring 0.7, $(shell $(DFU_PROGRAMMER) --version 2>&1)))
+        if $(DFU_PROGRAMMER) --version 2>&1 | grep -q 0.7 ; then\
-        $(DFU_PROGRAMMER) $(MCU) erase --force
+                $(DFU_PROGRAMMER) $(MCU) erase --force;\
-else
+        else\
-        $(DFU_PROGRAMMER) $(MCU) erase
+                $(DFU_PROGRAMMER) $(MCU) erase;\
-endif
+        fi
        $(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex
        $(DFU_PROGRAMMER) $(MCU) reset
@@ -135,11 +135,11 @@ flip-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
        $(REMOVE) $(BUILD_DIR)/$(TARGET)eep.hex
 dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
-ifneq (, $(findstring 0.7, $(shell dfu-programmer --version 2>&1)))
+        if $(DFU_PROGRAMMER) --version 2>&1 | grep -q 0.7 ; then\
-        $(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep
+                $(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep;\
-else
+        else\
-        $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(BUILD_DIR)/$(TARGET).eep
+                $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(BUILD_DIR)/$(TARGET).eep;\
-endif
+        fi
        $(DFU_PROGRAMMER) $(MCU) reset
 # Convert hex to bin.

diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index ccecdb192..a36d219dd 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk
@@ -115,11 +115,11 @@ dfu: $(BUILD_DIR)/$(TARGET).hex sizeafter
115	echo "Error: Bootloader not found. Trying again in 5s." ;\	115	echo "Error: Bootloader not found. Trying again in 5s." ;\
116	sleep 5 ;\	116	sleep 5 ;\
117	done	117	done
118	ifneq (, $(findstring 0.7, $(shell $(DFU_PROGRAMMER) --version 2>&1)))	118	if $(DFU_PROGRAMMER) --version 2>&1 \| grep -q 0.7 ; then\
119	$(DFU_PROGRAMMER) $(MCU) erase --force	119	$(DFU_PROGRAMMER) $(MCU) erase --force;\
120	else	120	else\
121	$(DFU_PROGRAMMER) $(MCU) erase	121	$(DFU_PROGRAMMER) $(MCU) erase;\
122	endif	122	fi
123	$(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex	123	$(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex
124	$(DFU_PROGRAMMER) $(MCU) reset	124	$(DFU_PROGRAMMER) $(MCU) reset
125		125
@@ -135,11 +135,11 @@ flip-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
135	$(REMOVE) $(BUILD_DIR)/$(TARGET)eep.hex	135	$(REMOVE) $(BUILD_DIR)/$(TARGET)eep.hex
136		136
137	dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep	137	dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
138	ifneq (, $(findstring 0.7, $(shell dfu-programmer --version 2>&1)))	138	if $(DFU_PROGRAMMER) --version 2>&1 \| grep -q 0.7 ; then\
139	$(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep	139	$(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep;\
140	else	140	else\
141	$(DFU_PROGRAMMER) $(MCU) flash-eeprom $(BUILD_DIR)/$(TARGET).eep	141	$(DFU_PROGRAMMER) $(MCU) flash-eeprom $(BUILD_DIR)/$(TARGET).eep;\
142	endif	142	fi
143	$(DFU_PROGRAMMER) $(MCU) reset	143	$(DFU_PROGRAMMER) $(MCU) reset
144		144
145	# Convert hex to bin.	145	# Convert hex to bin.