X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Fwin_shared_install.sh;h=27539c5b587e04d1d12025a68a570a56aab463aa;hb=e956c11bc96814872b142a8f97e03e2935d285b6;hp=e02511cf3e55536297a46b7cd4fdca49fde13999;hpb=d47db637edb4215f2313d59b6646e5e3dbb97e7c;p=qmk_firmware.git diff --git a/util/win_shared_install.sh b/util/win_shared_install.sh index e02511cf3..27539c5b5 100644 --- a/util/win_shared_install.sh +++ b/util/win_shared_install.sh @@ -18,9 +18,10 @@ function install_utils { wget 'https://www.pjrc.com/teensy/teensy_loader_cli_windows.zip' unzip teensy_loader_cli_windows.zip - echo "Installing Atmel Flip" - wget 'http://www.atmel.com/images/Flip%20Installer%20-%203.4.7.112.exe' - mv Flip\ Installer\ \-\ 3.4.7.112.exe FlipInstaller.exe + # This URL has changed and I can't find the new location. Commenting out until we figure out the new URL or determine this isn't needed. -skullY + #echo "Installing Atmel Flip" + #wget 'http://www.atmel.com/images/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 - @@ -45,7 +46,8 @@ if [ ! -d "$download_dir" ]; then else while true; do echo - read -p "The utils seem to already be downloaded, do you want to re-download them and update to the newest version (Y/N) " res + echo "The utils seem to already be downloaded." + read -p "Do you want to re-download them and update to the newest version (Y/N) " res case $res in [Yy]* ) install_utils; break;; [Nn]* ) break;; @@ -54,26 +56,16 @@ else done fi -pushd "$download_dir" -while true; do - echo - read -p "Flip need to be installed if you want to use that for programming, 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 - - while true; do echo echo "Which USB drivers do you want to install?" echo "(A)all - All supported drivers will be installed" - echo "(C)onnected - Only drivers for connected keyboards (in bootloader/flashing mode) will be installed" - echo "(F)force - Like all, but will also override existing drivers for connected keyboards" - echo "(N)one - No drivers will be installed, flashing your keyboard will most likely not work" + echo "(C)onnected - Only drivers for connected keyboards (in bootloader/flashing mode)" + echo " will be installed" + echo "(F)force - Like all, but will also override existing drivers for connected" + echo " keyboards" + echo "(N)one - No drivers will be installed," + echo " flashing your keyboard will most likely not work" read -p "(A/C/F/N)? " res case $res in [Aa]* ) install_drivers --all; break;;