diff options
Diffstat (limited to 'util')
-rwxr-xr-x | util/activate_msys2.sh | 1 | ||||
-rwxr-xr-x | util/activate_wsl.sh | 1 | ||||
-rwxr-xr-x | util/msys2_install.sh | 14 | ||||
-rwxr-xr-x | util/win_shared_install.sh | 4 | ||||
-rwxr-xr-x | util/wsl_install.sh | 15 |
5 files changed, 1 insertions, 34 deletions
diff --git a/util/activate_msys2.sh b/util/activate_msys2.sh index 07888ffe1..8741cc6b0 100755 --- a/util/activate_msys2.sh +++ b/util/activate_msys2.sh | |||
@@ -6,7 +6,6 @@ function export_variables { | |||
6 | export PATH=$PATH:$util_dir/dfu-programmer | 6 | export PATH=$PATH:$util_dir/dfu-programmer |
7 | export PATH=$PATH:$util_dir/dfu-util-0.9-win64 | 7 | export PATH=$PATH:$util_dir/dfu-util-0.9-win64 |
8 | export PATH=$PATH:$util_dir/bootloadHID.2012-12-08/commandline | 8 | export PATH=$PATH:$util_dir/bootloadHID.2012-12-08/commandline |
9 | export PATH=$PATH:$util_dir/flip/bin | ||
10 | export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin | 9 | export PATH=$PATH:$util_dir/avr8-gnu-toolchain/bin |
11 | export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin | 10 | export PATH=$PATH:$util_dir/gcc-arm-none-eabi/bin |
12 | } | 11 | } |
diff --git a/util/activate_wsl.sh b/util/activate_wsl.sh index 78bbf9ccb..26a47187a 100755 --- a/util/activate_wsl.sh +++ b/util/activate_wsl.sh | |||
@@ -8,7 +8,6 @@ function export_variables { | |||
8 | export DFU_UTIL=$download_dir/dfu-util-0.9-win64/dfu-util.exe | 8 | export DFU_UTIL=$download_dir/dfu-util-0.9-win64/dfu-util.exe |
9 | export TEENSY_LOADER_CLI=$download_dir/teensy_loader_cli.exe | 9 | export TEENSY_LOADER_CLI=$download_dir/teensy_loader_cli.exe |
10 | export BOOTLOADHID_PROGRAMMER=$download_dir/bootloadHID.2012-12-08/commandline/bootloadHID.exe | 10 | export BOOTLOADHID_PROGRAMMER=$download_dir/bootloadHID.2012-12-08/commandline/bootloadHID.exe |
11 | export BATCHISP=batchisp.exe | ||
12 | } | 11 | } |
13 | 12 | ||
14 | export_variables | 13 | export_variables |
diff --git a/util/msys2_install.sh b/util/msys2_install.sh index 001f55dc4..55df9c007 100755 --- a/util/msys2_install.sh +++ b/util/msys2_install.sh | |||
@@ -4,11 +4,10 @@ dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P) | |||
4 | download_dir=~/qmk_utils | 4 | download_dir=~/qmk_utils |
5 | avrtools=avr8-gnu-toolchain | 5 | avrtools=avr8-gnu-toolchain |
6 | armtools=gcc-arm-none-eabi | 6 | armtools=gcc-arm-none-eabi |
7 | installflip=false | ||
8 | util_dir=$(dirname "$0") | 7 | util_dir=$(dirname "$0") |
9 | 8 | ||
10 | echo "Installing dependencies needed for the installation (quazip)" | 9 | echo "Installing dependencies needed for the installation (quazip)" |
11 | pacman --needed --noconfirm --disable-download-timeout -Sy base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang msys/git msys/p7zip mingw-w64-x86_64-python3-pip msys/unzip | 10 | pacman --needed --noconfirm --disable-download-timeout -Sy base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang git mingw-w64-x86_64-python3-pip unzip |
12 | 11 | ||
13 | source "$dir/win_shared_install.sh" | 12 | source "$dir/win_shared_install.sh" |
14 | 13 | ||
@@ -31,19 +30,8 @@ function install_arm { | |||
31 | rm gcc-arm-none-eabi-8-2019-q3-update-win32.zip | 30 | rm gcc-arm-none-eabi-8-2019-q3-update-win32.zip |
32 | } | 31 | } |
33 | 32 | ||
34 | function extract_flip { | ||
35 | rm -f -r flip | ||
36 | 7z -oflip x FlipInstaller.exe | ||
37 | } | ||
38 | |||
39 | pushd "$download_dir" | 33 | pushd "$download_dir" |
40 | 34 | ||
41 | if [ -f "FlipInstaller.exe" ]; then | ||
42 | echo | ||
43 | echo "Extracting flip" | ||
44 | extract_flip | ||
45 | fi | ||
46 | |||
47 | if [ ! -d "$avrtools" ]; then | 35 | if [ ! -d "$avrtools" ]; then |
48 | echo | 36 | echo |
49 | echo "The AVR toolchain is not installed." | 37 | echo "The AVR toolchain is not installed." |
diff --git a/util/win_shared_install.sh b/util/win_shared_install.sh index 1265cb027..072ca47c8 100755 --- a/util/win_shared_install.sh +++ b/util/win_shared_install.sh | |||
@@ -22,10 +22,6 @@ function install_utils { | |||
22 | wget 'https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.zip' | 22 | wget 'https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.zip' |
23 | unzip bootloadHID.2012-12-08.zip | 23 | unzip bootloadHID.2012-12-08.zip |
24 | 24 | ||
25 | echo "Installing Atmel Flip" | ||
26 | wget 'http://ww1.microchip.com/downloads/en/DeviceDoc/Flip%20Installer%20-%203.4.7.112.exe' | ||
27 | mv Flip\ Installer\ \-\ 3.4.7.112.exe FlipInstaller.exe | ||
28 | |||
29 | echo "Downloading the QMK driver installer" | 25 | echo "Downloading the QMK driver installer" |
30 | wget -qO- https://api.github.com/repos/qmk/qmk_driver_installer/releases | grep browser_download_url | head -n 1 | cut -d '"' -f 4 | wget -i - | 26 | wget -qO- https://api.github.com/repos/qmk/qmk_driver_installer/releases | grep browser_download_url | head -n 1 | cut -d '"' -f 4 | wget -i - |
31 | 27 | ||
diff --git a/util/wsl_install.sh b/util/wsl_install.sh index 197d9f089..8ed177ca3 100755 --- a/util/wsl_install.sh +++ b/util/wsl_install.sh | |||
@@ -31,21 +31,6 @@ source "$dir/win_shared_install.sh" | |||
31 | 31 | ||
32 | pip3 install -r ${util_dir}/../requirements.txt | 32 | pip3 install -r ${util_dir}/../requirements.txt |
33 | 33 | ||
34 | pushd "$download_dir" | ||
35 | while true; do | ||
36 | echo | ||
37 | echo "Flip need to be installed if you want to use that for programming." | ||
38 | echo "Please install it to the default location!" | ||
39 | read -p "Do you want to install it now? (Y/N) " res | ||
40 | case $res in | ||
41 | [Yy]* ) cmd.exe /c FlipInstaller.exe; break;; | ||
42 | [Nn]* ) break;; | ||
43 | * ) echo "Invalid answer";; | ||
44 | esac | ||
45 | done | ||
46 | popd | ||
47 | |||
48 | |||
49 | echo | 34 | echo |
50 | echo "Creating a softlink to the utils directory as ~/qmk_utils." | 35 | echo "Creating a softlink to the utils directory as ~/qmk_utils." |
51 | echo "This is needed so that the the make system can find all utils it need." | 36 | echo "This is needed so that the the make system can find all utils it need." |