diff options
Diffstat (limited to 'util/msys2_install.sh')
-rwxr-xr-x | util/msys2_install.sh | 14 |
1 files changed, 1 insertions, 13 deletions
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." |