diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2017-07-11 17:32:58 +0300 |
|---|---|---|
| committer | Fred Sundvik <fsundvik@gmail.com> | 2017-07-11 17:32:58 +0300 |
| commit | 0d9e7f635e8f05356101d72725342fc272b7b71b (patch) | |
| tree | bac60593483ef208ad621c35d5a3ca837c0fe3db /util | |
| parent | 76bd0d3e184f77ff89f9db2274574093f78e49ca (diff) | |
| download | qmk_firmware-0d9e7f635e8f05356101d72725342fc272b7b71b.tar.gz qmk_firmware-0d9e7f635e8f05356101d72725342fc272b7b71b.zip | |
Extract flip
Diffstat (limited to 'util')
| -rw-r--r-- | util/msys2_install.sh | 12 | ||||
| -rw-r--r-- | util/win_shared_install.sh | 15 | ||||
| -rw-r--r-- | util/wsl_install.sh | 15 |
3 files changed, 27 insertions, 15 deletions
diff --git a/util/msys2_install.sh b/util/msys2_install.sh index 0bb75f94ce..866cc25a7c 100644 --- a/util/msys2_install.sh +++ b/util/msys2_install.sh @@ -4,6 +4,7 @@ dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P) download_dir=~/qmk_utils avrtools=avr8-gnu-toolchain armtools=gcc-arm-none-eabi +installflip=false echo "Installing dependencies needed for the installation (quazip)" pacman --needed -S msys/unzip msys/p7zip @@ -23,8 +24,19 @@ function install_arm { rm gcc-arm-none-eabi.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 while true; do echo diff --git a/util/win_shared_install.sh b/util/win_shared_install.sh index cfae578451..8d1949ae9f 100644 --- a/util/win_shared_install.sh +++ b/util/win_shared_install.sh @@ -55,21 +55,6 @@ else done fi -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 - - while true; do echo echo "Which USB drivers do you want to install?" diff --git a/util/wsl_install.sh b/util/wsl_install.sh index 89552b9918..1574803534 100644 --- a/util/wsl_install.sh +++ b/util/wsl_install.sh @@ -33,6 +33,21 @@ download_dir=wsl_downloaded source "$dir/win_shared_install.sh" +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." |