From 84d91bd3be64db5b57744fe8e679da7e45e37055 Mon Sep 17 00:00:00 2001
From: William Boman <william@redwill.se>
Date: Sat, 23 Apr 2022 09:39:25 +0200
Subject: feat(installer): ensure correct responses when prompting user (#2506)

---
 utils/installer/install.sh | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

(limited to 'utils/installer/install.sh')

diff --git a/utils/installer/install.sh b/utils/installer/install.sh
index b44880bd..0d56fe30 100755
--- a/utils/installer/install.sh
+++ b/utils/installer/install.sh
@@ -85,6 +85,25 @@ function msg() {
   printf "%s\n" "$text"
 }
 
+function confirm() {
+  local question="$1"
+  while true; do
+    msg "$question"
+    read -p "[y]es or [n]o (default: no) : " -r answer
+    case "$answer" in
+      y | Y | yes | YES | Yes)
+        return 0
+        ;;
+      n | N | no | NO | No | *[[:blank:]]* | "")
+        return 1
+        ;;
+      *)
+        msg "Please answer [y]es or [n]o."
+        ;;
+    esac
+  done
+}
+
 function main() {
   parse_arguments "$@"
 
@@ -97,17 +116,15 @@ function main() {
 
   if [ "$ARGS_INSTALL_DEPENDENCIES" -eq 1 ]; then
     if [ "$INTERACTIVE_MODE" -eq 1 ]; then
-      msg "Would you like to install LunarVim's NodeJS dependencies?"
-      read -p "[y]es or [n]o (default: no) : " -r answer
-      [ "$answer" != "${answer#[Yy]}" ] && install_nodejs_deps
-
-      msg "Would you like to install LunarVim's Python dependencies?"
-      read -p "[y]es or [n]o (default: no) : " -r answer
-      [ "$answer" != "${answer#[Yy]}" ] && install_python_deps
-
-      msg "Would you like to install LunarVim's Rust dependencies?"
-      read -p "[y]es or [n]o (default: no) : " -r answer
-      [ "$answer" != "${answer#[Yy]}" ] && install_rust_deps
+      if confirm "Would you like to install LunarVim's NodeJS dependencies?"; then
+        install_nodejs_deps
+      fi
+      if confirm "Would you like to install LunarVim's Python dependencies?"; then
+        install_python_deps
+      fi
+      if confirm "Would you like to install LunarVim's Rust dependencies?"; then
+        install_rust_deps
+      fi
     else
       install_nodejs_deps
       install_python_deps
-- 
cgit v1.2.3


From 3de829e76ed3d90b25250b1ab76f6425146af9d2 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Wed, 27 Apr 2022 17:37:27 +0200
Subject: refactor: lock new installations to nvim v0.7+ (#2526)

---
 utils/installer/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'utils/installer/install.sh')

diff --git a/utils/installer/install.sh b/utils/installer/install.sh
index 0d56fe30..66149cf6 100755
--- a/utils/installer/install.sh
+++ b/utils/installer/install.sh
@@ -197,11 +197,11 @@ function print_missing_dep_msg() {
 }
 
 function check_neovim_min_version() {
-  local verify_version_cmd='if !has("nvim-0.6.1") | cquit | else | quit | endif'
+  local verify_version_cmd='if !has("nvim-0.7") | cquit | else | quit | endif'
 
   # exit with an error if min_version not found
   if ! nvim --headless -u NONE -c "$verify_version_cmd"; then
-    echo "[ERROR]: LunarVim requires at least Neovim v0.6.1 or higher"
+    echo "[ERROR]: LunarVim requires at least Neovim v0.7 or higher"
     exit 1
   fi
 }
-- 
cgit v1.2.3