MSYS and WSL installation improvements (#10593)
Ryan
5 years ago
committed by
GitHub
parent
1a2a838bc2
commit
f0a1ab5488
@ -1,8 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
function export_variables {
|
|
||||||
local util_dir=~/qmk_utils
|
|
||||||
export PATH=$PATH:$util_dir
|
|
||||||
}
|
|
||||||
|
|
||||||
export_variables
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
function export_variables {
|
|
||||||
local util_dir=~/qmk_utils
|
|
||||||
local download_dir=$util_dir/wsl_downloaded
|
|
||||||
}
|
|
||||||
|
|
||||||
export_variables
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
function install_utils {
|
|
||||||
rm -f -r "$download_dir"
|
|
||||||
mkdir "$download_dir"
|
|
||||||
|
|
||||||
pushd "$download_dir"
|
|
||||||
|
|
||||||
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 -
|
|
||||||
|
|
||||||
rm -f *.zip
|
|
||||||
|
|
||||||
popd > /dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
function install_drivers {
|
|
||||||
pushd "$download_dir"
|
|
||||||
cp -f "$dir/drivers.txt" .
|
|
||||||
echo
|
|
||||||
cmd.exe //c "qmk_driver_installer.exe $1 $2 drivers.txt"
|
|
||||||
popd > /dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
pushd "$dir"
|
|
||||||
|
|
||||||
if [ ! -d "$download_dir" ]; then
|
|
||||||
install_utils
|
|
||||||
else
|
|
||||||
while true; do
|
|
||||||
echo
|
|
||||||
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;;
|
|
||||||
* ) echo "Invalid answer";;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
while true; do
|
|
||||||
echo
|
|
||||||
echo "Which USB drivers do you want to install?"
|
|
||||||
echo "(A)ll - All supported drivers will be installed"
|
|
||||||
echo "(C)onnected - Only drivers for connected keyboards (in bootloader/flashing mode)"
|
|
||||||
echo " will be installed"
|
|
||||||
echo "(F)orce - 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
|
|
||||||
[AaYy]* ) install_drivers --all; break;;
|
|
||||||
[Cc]* ) install_drivers; break;;
|
|
||||||
[Ff]* ) install_drivers --all --force; break;;
|
|
||||||
[Nn]* | "" ) break;;
|
|
||||||
* ) echo "Invalid answer";;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
popd > /dev/null
|
|
||||||
@ -1,80 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
util_dir=$(dirname "$0")
|
|
||||||
dir=$(cd -P -- "$util_dir" && pwd -P)
|
|
||||||
pushd "$dir";
|
|
||||||
|
|
||||||
if [[ $dir != /mnt/* ]];
|
|
||||||
then
|
|
||||||
echo
|
|
||||||
echo "You need to clone the qmk_firmware repository outside the linux filesystem."
|
|
||||||
echo "Otherwise the windows executables can't be run."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
while true; do
|
|
||||||
echo
|
|
||||||
echo "Do you want to install all toolchain dependencies needed for compiling QMK?"
|
|
||||||
echo "If you don't want that, you can install the dependencies manually."
|
|
||||||
read -p "(Y/N) " res
|
|
||||||
case $res in
|
|
||||||
[Yy]* ) ./linux_install.sh; break;;
|
|
||||||
[Nn]* ) break;;
|
|
||||||
* ) echo "Invalid answer";;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
download_dir=wsl_downloaded
|
|
||||||
|
|
||||||
source "$dir/win_shared_install.sh"
|
|
||||||
|
|
||||||
pip3 install -r ${util_dir}/../requirements.txt
|
|
||||||
|
|
||||||
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."
|
|
||||||
read -p "Press enter to continue (ctrl-c to abort)"
|
|
||||||
ln -sfn "$dir" ~/qmk_utils
|
|
||||||
|
|
||||||
if grep "^source ~/qmk_utils/activate_wsl.sh$" ~/.bashrc
|
|
||||||
then
|
|
||||||
echo
|
|
||||||
echo "The line source ~/qmk_utils/activate_wsl.sh is already added to your /.bashrc"
|
|
||||||
echo "Not adding it twice"
|
|
||||||
else
|
|
||||||
while true; do
|
|
||||||
echo
|
|
||||||
echo "Do you want to add 'source ~/qmk_utils/activate_wsl.sh' to the end of your"
|
|
||||||
echo ".bashrc file? Without this make won't find the needed utils, so if you don't"
|
|
||||||
echo "want to do it automatically, then you have to do it manually later."
|
|
||||||
read -p "(Y/N)? " res
|
|
||||||
case $res in
|
|
||||||
[Yy]* ) echo "source ~/qmk_utils/activate_wsl.sh" >> ~/.bashrc; break;;
|
|
||||||
[Nn]* ) break;;
|
|
||||||
* ) echo "Invalid answer";;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
while true; do
|
|
||||||
echo
|
|
||||||
echo "Do you want to add a symlink to the QMK repository in your home directory for"
|
|
||||||
echo "convenience? This will create a folder 'qmk_firmware' in your home directory."
|
|
||||||
echo "In the future you can use this folder instead of the full path on your Windows"
|
|
||||||
echo "file system."
|
|
||||||
read -p "(Y/N)? " res
|
|
||||||
case $res in
|
|
||||||
[Yy]* ) ln -sfn "$dir/.." ~/qmk_firmware; break;;
|
|
||||||
[Nn]* ) break;;
|
|
||||||
* ) echo "Invalid answer";;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
echo
|
|
||||||
echo "******************************************************************************"
|
|
||||||
echo "Installation completed!"
|
|
||||||
echo "You need to open a new bash command prompt for all the utils to work properly"
|
|
||||||
echo "******************************************************************************"
|
|
||||||
|
|
||||||
popd > /dev/null
|
|
||||||
Loading…
Reference in New Issue