summaryrefslogtreecommitdiff
path: root/util/msys2_install.sh
diff options
context:
space:
mode:
Diffstat (limited to 'util/msys2_install.sh')
-rwxr-xr-xutil/msys2_install.sh14
1 files changed, 1 insertions, 13 deletions
diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index 001f55dc48..55df9c007b 100755
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -4,11 +4,10 @@ dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
download_dir=~/qmk_utils
avrtools=avr8-gnu-toolchain
armtools=gcc-arm-none-eabi
-installflip=false
util_dir=$(dirname "$0")
echo "Installing dependencies needed for the installation (quazip)"
-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
+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
source "$dir/win_shared_install.sh"
@@ -31,19 +30,8 @@ function install_arm {
rm gcc-arm-none-eabi-8-2019-q3-update-win32.zip
}
-function extract_flip {
- rm -f -r flip
- 7z -oflip x FlipInstaller.exe
-}
-
pushd "$download_dir"
-if [ -f "FlipInstaller.exe" ]; then
- echo
- echo "Extracting flip"
- extract_flip
-fi
-
if [ ! -d "$avrtools" ]; then
echo
echo "The AVR toolchain is not installed."