diff options
Diffstat (limited to 'util')
| -rwxr-xr-x | util/new_keyboard.sh | 4 | ||||
| -rwxr-xr-x | util/travis_compiled_push.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/util/new_keyboard.sh b/util/new_keyboard.sh index 35d89e402..fe7c1a829 100755 --- a/util/new_keyboard.sh +++ b/util/new_keyboard.sh | |||
| @@ -41,8 +41,8 @@ copy_templates() { | |||
| 41 | echo " done" | 41 | echo " done" |
| 42 | 42 | ||
| 43 | echo -n "Renaming keyboard files..." | 43 | echo -n "Renaming keyboard files..." |
| 44 | mv "${keyboard_dir}/template.c" "${keyboard_dir}/${keyboard_name}.c" | 44 | mv "${keyboard_dir}/keyboard.c" "${keyboard_dir}/${keyboard_name}.c" |
| 45 | mv "${keyboard_dir}/template.h" "${keyboard_dir}/${keyboard_name}.h" | 45 | mv "${keyboard_dir}/keyboard.h" "${keyboard_dir}/${keyboard_name}.h" |
| 46 | echo " done" | 46 | echo " done" |
| 47 | } | 47 | } |
| 48 | 48 | ||
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 4737d693b..8ca65f21a 100755 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh | |||
| @@ -12,7 +12,7 @@ if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; the | |||
| 12 | # fix formatting | 12 | # fix formatting |
| 13 | git checkout master | 13 | git checkout master |
| 14 | git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix | 14 | git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix |
| 15 | git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | grep -e '^drivers' -e '^quantum' -e '^tests' -e '^tmk_core' | xargs -0 clang-format | 15 | git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | grep -e '^drivers' -e '^quantum' -e '^tests' -e '^tmk_core' | grep -v 'quantum/template' | xargs -0 clang-format |
| 16 | git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add | 16 | git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add |
| 17 | git commit -m "format code according to conventions [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master | 17 | git commit -m "format code according to conventions [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master |
| 18 | 18 | ||
