diff --git a/Makefile b/Makefile index 579c7af..d72bb34 100644 --- a/Makefile +++ b/Makefile @@ -18,9 +18,10 @@ help: @grep -E '^[-a-zA-Z0-9_\.\/]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[32m%-15s\033[0m %s\n", $$1, $$2}' .PHONY: update -update: qmk_firmware qmk_firmware/patches_applied ## Update qmk_firmware +update: qmk_firmware ## Update qmk_firmware @git -C qmk_firmware fetch @git -C qmk_firmware checkout $(QMK_FIRMWARE_COMMIT) + $(MAKE) qmk_firmware/patches_applied .PHONY: write write: mdloader builds/$(WRITE_TARGET).bin ## Write a layout to the keyboard, pass WRITE_TARGET as variable to control the particular layout @@ -35,8 +36,8 @@ qmk_firmware: @git -C qmk_firmware checkout $(QMK_FIRMWARE_COMMIT) $(MAKE) qmk_firmware/patches_applied -qmk_firmware/patches_applied: qmk_patches.diff - @sudo git -C qmk_firmware clean -dffx +qmk_firmware/patches_applied: qmk_patches.diff qmk_firmware/.git/HEAD + @git -C qmk_firmware clean -dffx 2>/dev/null || true @git -C qmk_firmware reset --hard HEAD @git -C qmk_firmware apply ../qmk_patches.diff @touch qmk_firmware/patches_applied