Use home directory for download on msys2

diff --git a/util/msys2_install.sh b/util/msys2_install.sh
index b59eac0cac99b0e375be3d7d57331e64f7c039bc..aed6c42bd52c6d4cd19f8ade7690bab63f2d4f4c 100644 (file)
--- a/util/msys2_install.sh
+++ b/util/msys2_install.sh
@@ -3,7 +3,9 @@
 dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
 
 echo "Installing dependencies needed for the installation (quazip)"
-pacman -S msys/unzip
+pacman --needed -S msys/unzip
+
+export download_dir=~/qmk_utils
 
 source "$dir/win_shared_install.sh"
 

diff --git a/util/win_shared_install.sh b/util/win_shared_install.sh
index c30e28796b2aeb001b1d91206b8c8a124fc4f3e0..e02511cf3e55536297a46b7cd4fdca49fde13999 100644 (file)
--- a/util/win_shared_install.sh
+++ b/util/win_shared_install.sh
@@ -1,13 +1,10 @@
 #!/bin/bash
 
-download_dir=win_downloaded
-wsl_download_dir=wsl_downloaded
-
 function install_utils {
-    rm -f -r $download_dir
-    mkdir $download_dir
+    rm -f -r "$download_dir"
+    mkdir "$download_dir"
 
-    pushd $download_dir
+    pushd "$download_dir"
 
     echo "Installing dfu-programmer"
     wget 'http://downloads.sourceforge.net/project/dfu-programmer/dfu-programmer/0.7.2/dfu-programmer-win-0.7.2.zip'
@@ -34,19 +31,15 @@ function install_utils {
 }
 
 function install_drivers {
-    pushd $download_dir
+    pushd "$download_dir"
+    cp -f "$dir/drivers.txt" .
     echo 
-    cmd.exe /c "qmk_driver_installer.exe $1 $2 ..\\drivers.txt"
+    cmd.exe /c "qmk_driver_installer.exe $1 $2 drivers.txt"
     popd > /dev/null
 }
 
 pushd "$dir"
 
-if [ -d "$wsl_download_dir" ]; then
-    echo "Renaming existing wsl_download_dir to win_download"
-    mv -f "$wsl_download_dir" "$download_dir"
-fi
-
 if [ ! -d "$download_dir" ]; then
     install_utils
 else
@@ -61,15 +54,17 @@ 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 $download_dir\\FlipInstaller.exe; break;;
+        [Yy]* ) cmd.exe /c FlipInstaller.exe; break;;
         [Nn]* ) break;;
         * ) echo "Invalid answer";;
     esac
 done
+popd
 
 
 while true; do

diff --git a/util/wsl_install.sh b/util/wsl_install.sh
index 5da64b1d0a2983713f70b892ccfc990ae6e5131f..b593c6e777ec95fd47339c82a10b04d247c0804f 100644 (file)
--- a/util/wsl_install.sh
+++ b/util/wsl_install.sh
@@ -28,6 +28,9 @@ done
 echo "Installing dependencies needed for the installation (unzip, wget)"
 echo "This will ask for the sudo password"
 sudo apt-get install unzip wget
+
+download_dir=wsl_downloaded
+
 source "$dir/win_shared_install.sh"
 
 echo