From c6f46947704127fc4ecc3fb657d158d9565f72af Mon Sep 17 00:00:00 2001 From: Dave G Vigil Sr Date: Thu, 12 Oct 2023 23:29:32 -0500 Subject: [PATCH] Update --- .gitignore | 6 ++++++ Makefile | 24 ++++++++++++------------ qmk_firmware | 1 + 3 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 .gitignore create mode 160000 qmk_firmware diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6fbbc3b --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +obj_* +*.hex +*.elf +*.map +build/ +.DS_Store diff --git a/Makefile b/Makefile index 18df9eb..d09b371 100644 --- a/Makefile +++ b/Makefile @@ -16,21 +16,21 @@ $(KEYBOARDS): git submodule update --init --recursive # cleanup old symlinks - rm -rf qmk_firmware/keyboards/draculad/keymaps/$(USER) - rm -rf qmk_firmware/keyboards/keebio/iris/keymaps/$(USER) - rm -rf qmk_firmware/keyboards/handwired/scottokeebs/scottogame/keymaps/$(USER) - rm -rf qmk_firmware/keyboards/bluebell/swoop/keymaps/$(USER) - rm -rf qmk_firmware/keyboards/ferris/keymaps/$(USER) - rm -rf qmk_firmware/users/$(USER) + if [ -d "qmk_firmware/keyboards/draculad/keymaps/$(USER)" ]; then rm -rf qmk_firmware/keyboards/draculad/keymaps/$(USER) ; fi + if [ -d "qmk_firmware/keyboards/keebio/iris/keymaps/$(USER)" ]; then rm -rf qmk_firmware/keyboards/keebio/iris/keymaps/$(USER) ; fi + if [ -d "qmk_firmware/keyboards/handwired/scottokeebs/scottogame/keymaps//$(USER)" ]; then rm -rf qmk_firmware/keyboards/handwired/scottokeebs/scottogame/keymaps/$(USER) ; fi + if [ -d "qmk_firmware/keyboards/bluebell/swoop/keymaps/$(USER)" ]; then rm -rf qmk_firmware/keyboards/bluebell/swoop/keymaps/$(USER); fi + if [ -d "qmk_firmware/keyboards/ferris/keymaps/$(USER)" ]; then rm -rf qmk_firmware/keyboards/ferris/keymaps/$(USER); fi + if [ -d "qmk_firmware/users/$(USER)" ]; then rm -rf qmk_firmware/users/$(USER); fi # add new symlinks - ln -s $(shell pwd)/draculad qmk_firmware/keyboards/draculad/keymaps/$(USER) - ln -s $(shell pwd)/iris qmk_firmware/keyboards/keebio/iris/keymaps/$(USER) - ln -s $(shell pwd)/sweep qmk_firmware/keyboards/ferris/keymaps/$(USER) - ln -s $(shell pwd)/scottogame qmk_firmware/keyboards/handwired/scottokeebs/scottogame/keymaps/$(USER) - ln -s $(shell pwd)/swoop qmk_firmware/keyboards/bluebell/swoop/keymaps/$(USER) - ln -s $(shell pwd)/user qmk_firmware/users/$(USER) + ln -s $(shell pwd)/draculad/ qmk_firmware/keyboards/draculad/keymaps/$(USER) + ln -s $(shell pwd)/iris/ qmk_firmware/keyboards/keebio/iris/keymaps/$(USER) + ln -s $(shell pwd)/sweep/ qmk_firmware/keyboards/ferris/keymaps/$(USER) + ln -s $(shell pwd)/scottogame/ qmk_firmware/keyboards/handwired/scottokeebs/scottogame/keymaps/$(USER) + ln -s $(shell pwd)/swoop/ qmk_firmware/keyboards/bluebell/swoop/keymaps/$(USER) + ln -s $(shell pwd)/user/ qmk_firmware/users/$(USER) # run lint check cd qmk_firmware; qmk lint -km $(USER) -kb $(NAME_$@) diff --git a/qmk_firmware b/qmk_firmware new file mode 160000 index 0000000..b630df1 --- /dev/null +++ b/qmk_firmware @@ -0,0 +1 @@ +Subproject commit b630df1aa739c285f290333ff2cf7de024b4693e