Extract flip

diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index 0bb75f94ce25ba98075742023ea4a93f396aa885..866cc25a7c7060140c1e1966c7ee7bf97b43bf7a 100644 (file)
--- 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 cfae5784518e38a0c779468934138db11ba7be46..8d1949ae9fead446e87a2aca3b4010c8bb359bc5 100644 (file)
--- 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 89552b991891ec0d639c18d60021d2cf3fed1de9..1574803534b2030eb024e2b68977604a4e95559a 100644 (file)
--- 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."