From 5466f15329f8c9a12a74769d28482cc8d26c44f1 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Thu, 6 Oct 2022 14:50:18 +0000
Subject: [PATCH 1/2] Node: Fix nvm ownership

---
 src/node/devcontainer-feature.json | 2 +-
 src/node/install.sh                | 6 ++++--
 test/node/test.sh                  | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
index 965df9069..8f9236503 100644
--- a/src/node/devcontainer-feature.json
+++ b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "name": "Node.js (via nvm) and yarn",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, and needed dependencies.",
diff --git a/src/node/install.sh b/src/node/install.sh
index 8eae62ea3..260df5005 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -107,7 +107,7 @@ export NVM_SYMLINK_CURRENT=true
 if [ -d "${NVM_DIR}" ]; then
     echo "NVM already installed."
     if [ "${NODE_VERSION}" != "" ]; then
-       su ${USERNAME} -c ". $NVM_DIR/nvm.sh && nvm install ${NODE_VERSION} && nvm clear-cache"
+       su ${USERNAME} -c "umask 0002 && . $NVM_DIR/nvm.sh && nvm install ${NODE_VERSION} && nvm clear-cache"
     fi
     exit 0
 fi
@@ -120,7 +120,7 @@ umask 0002
 usermod -a -G nvm ${USERNAME}
 mkdir -p ${NVM_DIR}
 chown "${USERNAME}:nvm" ${NVM_DIR}
-chmod g+s ${NVM_DIR}
+chmod -R g+r+w ${NVM_DIR}
 su ${USERNAME} -c "$(cat << EOF
     set -e
     umask 0002
@@ -185,4 +185,6 @@ if [ "${INSTALL_TOOLS_FOR_NODE_GYP}" = "true" ]; then
     fi
 fi
 
+find "${NVM_DIR}" -type d -print0 | xargs -n 1 -0 chmod g+s
+
 echo "Done!"
diff --git a/test/node/test.sh b/test/node/test.sh
index 3478478fe..6b6804d0b 100755
--- a/test/node/test.sh
+++ b/test/node/test.sh
@@ -7,6 +7,7 @@ source dev-container-features-test-lib
 
 # Definition specific tests
 check "version" node  --version
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
 
 # Report result
 reportResults
\ No newline at end of file

From f808f916fa24be0617ccd50c011e3ca6d6fb1c92 Mon Sep 17 00:00:00 2001
From: Samruddhi Khandale <skhandale@microsoft.com>
Date: Thu, 6 Oct 2022 17:07:43 +0000
Subject: [PATCH 2/2] remove 0002

---
 src/node/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/install.sh b/src/node/install.sh
index 260df5005..6a237d66b 100755
--- a/src/node/install.sh
+++ b/src/node/install.sh
@@ -107,7 +107,7 @@ export NVM_SYMLINK_CURRENT=true
 if [ -d "${NVM_DIR}" ]; then
     echo "NVM already installed."
     if [ "${NODE_VERSION}" != "" ]; then
-       su ${USERNAME} -c "umask 0002 && . $NVM_DIR/nvm.sh && nvm install ${NODE_VERSION} && nvm clear-cache"
+       su ${USERNAME} -c ". $NVM_DIR/nvm.sh && nvm install ${NODE_VERSION} && nvm clear-cache"
     fi
     exit 0
 fi