From 9b2629384fd35771a5e91268f9a8d006b5012705 Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Fri, 17 Mar 2017 23:20:17 -0700
Subject: [PATCH] [Fix] `nvm install -s`: ensure additional params lack a
 trailing space.

Note: I believe this does not fix the underlying issue in zsh, which is
that it does not split up `$ADDITIONAL_PARAMETERS` and instead passes
the contents as one single argument.
---
 nvm.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nvm.sh b/nvm.sh
index 1fa9278..122b728 100644
--- a/nvm.sh
+++ b/nvm.sh
@@ -1826,7 +1826,11 @@ nvm_install_source() {
   local NVM_ARCH
   NVM_ARCH="$(nvm_get_arch)"
   if [ "${NVM_ARCH}" = 'armv6l' ] || [ "${NVM_ARCH}" = 'armv7l' ]; then
-    ADDITIONAL_PARAMETERS="--without-snapshot ${ADDITIONAL_PARAMETERS}"
+    if [ -n "${ADDITIONAL_PARAMETERS}" ]; then
+      ADDITIONAL_PARAMETERS="--without-snapshot ${ADDITIONAL_PARAMETERS}"
+    else
+      ADDITIONAL_PARAMETERS='--without-snapshot'
+    fi
   fi
 
   if [ -n "${ADDITIONAL_PARAMETERS}" ]; then
@@ -1883,6 +1887,7 @@ nvm_install_source() {
     command "${tar}" -x${tar_compression_flag}f "${TARBALL}" -C "${TMPDIR}" --strip-components 1 && \
     VERSION_PATH="$(nvm_version_path "${PREFIXED_VERSION}")" && \
     nvm_cd "${TMPDIR}" && \
+    nvm_echo '$>'./configure --prefix="${VERSION_PATH}" $ADDITIONAL_PARAMETERS'<' && \
     ./configure --prefix="${VERSION_PATH}" $ADDITIONAL_PARAMETERS && \
     $make -j "${NVM_MAKE_JOBS}" ${MAKE_CXX-} && \
     command rm -f "${VERSION_PATH}" 2>/dev/null && \