diff options
| author | Erez Zukerman <bulk@ezuk.org> | 2018-05-15 10:50:24 -0400 |
|---|---|---|
| committer | Erez Zukerman <bulk@ezuk.org> | 2018-05-15 10:50:24 -0400 |
| commit | 5272218ac9cff7ce5af8cfda9129dc03b7aafa49 (patch) | |
| tree | 61ad3987770684afd55cbdd12bca48a221d83713 /util | |
| parent | 0592d23b74142a554c9e36d2da7bf525fbe3a4c0 (diff) | |
| parent | e41147da929afd15c1088226893cc02537650284 (diff) | |
| download | qmk_firmware-5272218ac9cff7ce5af8cfda9129dc03b7aafa49.tar.gz qmk_firmware-5272218ac9cff7ce5af8cfda9129dc03b7aafa49.zip | |
Merge branch 'master' into hf/shinydox
Diffstat (limited to 'util')
| -rw-r--r-- | util/activate_msys2.sh | 1 | ||||
| -rw-r--r-- | util/msys2_install.sh | 2 | ||||
| -rwxr-xr-x | util/new_project.sh | 24 |
3 files changed, 21 insertions, 6 deletions
diff --git a/util/activate_msys2.sh b/util/activate_msys2.sh index 8874d8325f..1ddffbaad7 100644 --- a/util/activate_msys2.sh +++ b/util/activate_msys2.sh @@ -8,6 +8,7 @@ function export_variables { export PATH=$PATH:$util_dir/flip/bin export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin + export PATH=$PATH:/mingw64/bin } export_variables diff --git a/util/msys2_install.sh b/util/msys2_install.sh index c646857541..d9459580c7 100644 --- a/util/msys2_install.sh +++ b/util/msys2_install.sh @@ -67,7 +67,7 @@ if [ ! -d "$armtools" ]; then while true; do echo echo "The ARM toolchain is not installed." - echo "This is needed for building ARM based keboards." + echo "This is needed for building ARM based keyboards." read -p "Do you want to install it? (Y/N) " res case $res in [Yy]* ) install_arm; break;; diff --git a/util/new_project.sh b/util/new_project.sh index 0c28feb4ae..a85e833222 100755 --- a/util/new_project.sh +++ b/util/new_project.sh @@ -2,9 +2,21 @@ # Script to make a new quantum project # Jack Humbert 2015 -if [ -z "$1" ]; then - echo "Usage: $0 <keyboard_name>" - exit 1 +KEYBOARD=$1 +KEYBOARD_TYPE=$2 + +if [ -z "$KEYBOARD" ]; then + echo "Usage: $0 <keyboard_name> <keyboard_type>" + echo "Example: $0 gh60 avr" + echo "Example: $0 bfake ps2avrgb" + exit 1 +elif [ -z "$KEYBOARD_TYPE" ]; then + KEYBOARD_TYPE=avr +fi + +if [ $KEYBOARD_TYPE != "avr" -a $KEYBOARD_TYPE != "ps2avrgb" ]; then + echo "Invalid keyboard type target" + exit 1 fi if [ -e "keyboards/$1" ]; then @@ -14,12 +26,14 @@ fi cd "$(dirname "$0")/.." -KEYBOARD=$1 KEYBOARD_UPPERCASE=$(echo $1 | awk '{print toupper($0)}') KEYBOARD_NAME=$(basename $1) KEYBOARD_NAME_UPPERCASE=$(echo $KEYBOARD_NAME | awk '{print toupper($0)}') -cp -r quantum/template keyboards/$KEYBOARD + +cp -r quantum/template/base keyboards/$KEYBOARD +cp -r quantum/template/$KEYBOARD_TYPE/. keyboards/$KEYBOARD + mv keyboards/${KEYBOARD}/template.c keyboards/${KEYBOARD}/${KEYBOARD_NAME}.c mv keyboards/${KEYBOARD}/template.h keyboards/${KEYBOARD}/${KEYBOARD_NAME}.h find keyboards/${KEYBOARD} -type f -exec sed -i '' -e "s;%KEYBOARD%;${KEYBOARD_NAME};g" {} \; |