summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2017-07-11 16:26:29 +0300
committerFred Sundvik <fsundvik@gmail.com>2017-07-11 16:26:29 +0300
commitb85ce4ce225e6e4f42d0cd8a8d9615260960edc6 (patch)
treef8fe32df86d0dd967b8aad30513f6a5a040ad87f
parentd47db637edb4215f2313d59b6646e5e3dbb97e7c (diff)
Fix overlong lines, and a few spelling errors
-rw-r--r--util/win_shared_install.sh16
-rw-r--r--util/wsl_install.sh13
2 files changed, 18 insertions, 11 deletions
diff --git a/util/win_shared_install.sh b/util/win_shared_install.sh
index e02511cf3e..cfae578451 100644
--- a/util/win_shared_install.sh
+++ b/util/win_shared_install.sh
@@ -45,7 +45,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;;
@@ -57,7 +58,9 @@ 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
+ 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;;
@@ -71,9 +74,12 @@ 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;;
diff --git a/util/wsl_install.sh b/util/wsl_install.sh
index b593c6e777..89552b9918 100644
--- a/util/wsl_install.sh
+++ b/util/wsl_install.sh
@@ -47,9 +47,9 @@ then
else
while true; do
echo
- echo "Do you want to add 'source ~/qmk_utils/activate_wsl.sh' to the end of you .bashrc file?"
- echo "Without this make won't find the needed utils, so if you don't want to do it automatically,"
- echo "then you have to do it manually."
+ 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;;
@@ -61,9 +61,10 @@ fi
while true; do
echo
- echo "Do you want to add a symlink to the QMK repository in your home directory for convenience?"
- echo "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 file system"
+ 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;;