From bc13dcd349430074d4276da33ec282bdd7833c78 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Apr 2020 17:50:58 +1000 Subject: Remove Atmel FLIP from install scripts and documentation (#8822) --- util/activate_msys2.sh | 1 - util/activate_wsl.sh | 1 - util/msys2_install.sh | 14 +------------- util/win_shared_install.sh | 4 ---- util/wsl_install.sh | 15 --------------- 5 files changed, 1 insertion(+), 34 deletions(-) (limited to 'util') 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 { export PATH=$PATH:$util_dir/dfu-programmer export PATH=$PATH:$util_dir/dfu-util-0.9-win64 export PATH=$PATH:$util_dir/bootloadHID.2012-12-08/commandline - 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 } 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 { export DFU_UTIL=$download_dir/dfu-util-0.9-win64/dfu-util.exe export TEENSY_LOADER_CLI=$download_dir/teensy_loader_cli.exe export BOOTLOADHID_PROGRAMMER=$download_dir/bootloadHID.2012-12-08/commandline/bootloadHID.exe - export BATCHISP=batchisp.exe } 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) 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." 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 { wget 'https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.zip' unzip bootloadHID.2012-12-08.zip - echo "Installing Atmel Flip" - wget 'http://ww1.microchip.com/downloads/en/DeviceDoc/Flip%20Installer%20-%203.4.7.112.exe' - mv Flip\ Installer\ \-\ 3.4.7.112.exe FlipInstaller.exe - echo "Downloading the QMK driver installer" 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 - 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" pip3 install -r ${util_dir}/../requirements.txt -pushd "$download_dir" -while true; do - echo - echo "Flip need to be installed if you want to use that for programming." - echo "Please install it to the default location!" - read -p "Do you want to install it now? (Y/N) " res - case $res in - [Yy]* ) cmd.exe /c FlipInstaller.exe; break;; - [Nn]* ) break;; - * ) echo "Invalid answer";; - esac -done -popd - - echo echo "Creating a softlink to the utils directory as ~/qmk_utils." echo "This is needed so that the the make system can find all utils it need." -- cgit v1.2.3