Merge branch 'rolling'

4 files changed, 12 insertions, 4 deletions

diff --git a/utils/docker/Dockerfile.local b/utils/docker/Dockerfile.local
index c219e34f..ed4a67f3 100644
--- a/utils/docker/Dockerfile.local
+++ b/utils/docker/Dockerfile.local
@@ -20,7 +20,7 @@ RUN apt update && \
   /LunarVim/utils/installer/install-neovim-from-release && \
   /LunarVim/utils/installer/install.sh --local --no-install-dependencies
 
-# Setup LVIM to run on starup
+# Setup LVIM to run on startup
 ENTRYPOINT ["/bin/bash"]
 CMD ["lvim"]
 
diff --git a/utils/docker/Dockerfile.remote b/utils/docker/Dockerfile.remote
index 94765c48..179a5a42 100644
--- a/utils/docker/Dockerfile.remote
+++ b/utils/docker/Dockerfile.remote
@@ -20,7 +20,7 @@ RUN apt update && \
   curl -LSs https://raw.githubusercontent.com/lunarvim/lunarvim/${LV_BRANCH}/utils/installer/install-neovim-from-release | bash && \
   LV_BRANCH=${LV_BRANCH} curl -LSs https://raw.githubusercontent.com/lunarvim/lunarvim/${LV_BRANCH}/utils/installer/install.sh | bash -s -- --no-install-dependencies
 
-# Setup LVIM to run on starup
+# Setup LVIM to run on startup
 ENTRYPOINT ["/bin/bash"]
 CMD ["lvim"]
 
diff --git a/utils/installer/install-neovim-from-release b/utils/installer/install-neovim-from-release
index e20a4804..e98b1aee 100755
--- a/utils/installer/install-neovim-from-release
+++ b/utils/installer/install-neovim-from-release
@@ -55,7 +55,7 @@ function verify_neovim() {
   DOWNLOADED_SHA="$(openssl dgst -sha256 "$DOWNLOAD_DIR/$ARCHIVE_NAME.tar.gz" | awk '{print $2}')"
 
   if [ "$RELEASE_SHA" != "$DOWNLOADED_SHA" ]; then
-    echo "Error! checksum mis-match."
+    echo "Error! checksum mismatch."
     echo "Expected: $RELEASE_SHA but got: $DOWNLOADED_SHA"
     exit 1
   fi
diff --git a/utils/installer/install.sh b/utils/installer/install.sh
index 309b8fdc..13679367 100755
--- a/utils/installer/install.sh
+++ b/utils/installer/install.sh
@@ -201,6 +201,12 @@ function check_system_deps() {
   check_neovim_min_version
 }
 
+function __install_nodejs_deps_pnpm() {
+  echo "Installing node modules with pnpm.."
+  pnpm install -g "${__npm_deps[@]}"
+  echo "All NodeJS dependencies are successfully installed"
+}
+
 function __install_nodejs_deps_npm() {
   echo "Installing node modules with npm.."
   for dep in "${__npm_deps[@]}"; do
@@ -229,6 +235,8 @@ function __validate_node_installation() {
 
   if [ "$pkg_manager" == "npm" ]; then
     manager_home="$(npm config get prefix 2>/dev/null)"
+  elif [ "$pkg_manager" == "pnpm" ]; then
+    manager_home="$(pnpm config get prefix 2>/dev/null)"
   else
     manager_home="$(yarn global bin 2>/dev/null)"
   fi
@@ -242,7 +250,7 @@ function __validate_node_installation() {
 }
 
 function install_nodejs_deps() {
-  local -a pkg_managers=("yarn" "npm")
+  local -a pkg_managers=("pnpm" "yarn" "npm")
   for pkg_manager in "${pkg_managers[@]}"; do
     if __validate_node_installation "$pkg_manager"; then
       eval "__install_nodejs_deps_$pkg_manager"