Automated update for script library changes

CI · CI · commit ed0abe0b0fd2 · 2020-08-10T01:31:40.000Z
diff --git a/containers/azure-ansible/.devcontainer/library-scripts/node-debian.sh b/containers/azure-ansible/.devcontainer/library-scripts/node-debian.sh
@@ -60,17 +60,16 @@ mkdir -p ${NVM_DIR}
 
 # Set up non-root user if applicable
 if [ "${USERNAME}" != "root" ] && id -u $USERNAME > /dev/null 2>&1; then
-    # Add NVM init to non-root user
     tee -a /home/${USERNAME}/.bashrc /home/${USERNAME}/.zshrc >> /root/.zshrc \
 << EOF
-            export NVM_DIR="${NVM_DIR}"
-            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
-            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
 EOF
     
-    # Add code to update NVM ownership if UID/GID changes
+    # Add NVM init and add code to update NVM ownership if UID/GID changes
     tee -a /root/.bashrc /root/.zshrc /home/${USERNAME}/.bashrc >> /home/${USERNAME}/.zshrc \
 <<EOF
+            export NVM_DIR="${NVM_DIR}"
+            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
+            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
             if [ "\$(stat -c '%U' \$NVM_DIR)" != "${USERNAME}" ]; then
                 sudo chown -R ${USERNAME}:root \$NVM_DIR
             fi
diff --git a/containers/azure-blockchain/.devcontainer/library-scripts/node-debian.sh b/containers/azure-blockchain/.devcontainer/library-scripts/node-debian.sh
@@ -60,17 +60,16 @@ mkdir -p ${NVM_DIR}
 
 # Set up non-root user if applicable
 if [ "${USERNAME}" != "root" ] && id -u $USERNAME > /dev/null 2>&1; then
-    # Add NVM init to non-root user
     tee -a /home/${USERNAME}/.bashrc /home/${USERNAME}/.zshrc >> /root/.zshrc \
 << EOF
-            export NVM_DIR="${NVM_DIR}"
-            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
-            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
 EOF
     
-    # Add code to update NVM ownership if UID/GID changes
+    # Add NVM init and add code to update NVM ownership if UID/GID changes
     tee -a /root/.bashrc /root/.zshrc /home/${USERNAME}/.bashrc >> /home/${USERNAME}/.zshrc \
 <<EOF
+            export NVM_DIR="${NVM_DIR}"
+            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
+            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
             if [ "\$(stat -c '%U' \$NVM_DIR)" != "${USERNAME}" ]; then
                 sudo chown -R ${USERNAME}:root \$NVM_DIR
             fi
diff --git a/containers/azure-terraform/.devcontainer/library-scripts/node-debian.sh b/containers/azure-terraform/.devcontainer/library-scripts/node-debian.sh
@@ -60,17 +60,16 @@ mkdir -p ${NVM_DIR}
 
 # Set up non-root user if applicable
 if [ "${USERNAME}" != "root" ] && id -u $USERNAME > /dev/null 2>&1; then
-    # Add NVM init to non-root user
     tee -a /home/${USERNAME}/.bashrc /home/${USERNAME}/.zshrc >> /root/.zshrc \
 << EOF
-            export NVM_DIR="${NVM_DIR}"
-            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
-            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
 EOF
     
-    # Add code to update NVM ownership if UID/GID changes
+    # Add NVM init and add code to update NVM ownership if UID/GID changes
     tee -a /root/.bashrc /root/.zshrc /home/${USERNAME}/.bashrc >> /home/${USERNAME}/.zshrc \
 <<EOF
+            export NVM_DIR="${NVM_DIR}"
+            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
+            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
             if [ "\$(stat -c '%U' \$NVM_DIR)" != "${USERNAME}" ]; then
                 sudo chown -R ${USERNAME}:root \$NVM_DIR
             fi
diff --git a/containers/dotnetcore-fsharp/.devcontainer/library-scripts/node-debian.sh b/containers/dotnetcore-fsharp/.devcontainer/library-scripts/node-debian.sh
@@ -60,17 +60,16 @@ mkdir -p ${NVM_DIR}
 
 # Set up non-root user if applicable
 if [ "${USERNAME}" != "root" ] && id -u $USERNAME > /dev/null 2>&1; then
-    # Add NVM init to non-root user
     tee -a /home/${USERNAME}/.bashrc /home/${USERNAME}/.zshrc >> /root/.zshrc \
 << EOF
-            export NVM_DIR="${NVM_DIR}"
-            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
-            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
 EOF
     
-    # Add code to update NVM ownership if UID/GID changes
+    # Add NVM init and add code to update NVM ownership if UID/GID changes
     tee -a /root/.bashrc /root/.zshrc /home/${USERNAME}/.bashrc >> /home/${USERNAME}/.zshrc \
 <<EOF
+            export NVM_DIR="${NVM_DIR}"
+            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
+            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
             if [ "\$(stat -c '%U' \$NVM_DIR)" != "${USERNAME}" ]; then
                 sudo chown -R ${USERNAME}:root \$NVM_DIR
             fi
diff --git a/containers/dotnetcore/.devcontainer/library-scripts/node-debian.sh b/containers/dotnetcore/.devcontainer/library-scripts/node-debian.sh
@@ -60,17 +60,16 @@ mkdir -p ${NVM_DIR}
 
 # Set up non-root user if applicable
 if [ "${USERNAME}" != "root" ] && id -u $USERNAME > /dev/null 2>&1; then
-    # Add NVM init to non-root user
     tee -a /home/${USERNAME}/.bashrc /home/${USERNAME}/.zshrc >> /root/.zshrc \
 << EOF
-            export NVM_DIR="${NVM_DIR}"
-            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
-            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
 EOF
     
-    # Add code to update NVM ownership if UID/GID changes
+    # Add NVM init and add code to update NVM ownership if UID/GID changes
     tee -a /root/.bashrc /root/.zshrc /home/${USERNAME}/.bashrc >> /home/${USERNAME}/.zshrc \
 <<EOF
+            export NVM_DIR="${NVM_DIR}"
+            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
+            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
             if [ "\$(stat -c '%U' \$NVM_DIR)" != "${USERNAME}" ]; then
                 sudo chown -R ${USERNAME}:root \$NVM_DIR
             fi
diff --git a/containers/java/.devcontainer/library-scripts/node-debian.sh b/containers/java/.devcontainer/library-scripts/node-debian.sh
@@ -60,17 +60,16 @@ mkdir -p ${NVM_DIR}
 
 # Set up non-root user if applicable
 if [ "${USERNAME}" != "root" ] && id -u $USERNAME > /dev/null 2>&1; then
-    # Add NVM init to non-root user
     tee -a /home/${USERNAME}/.bashrc /home/${USERNAME}/.zshrc >> /root/.zshrc \
 << EOF
-            export NVM_DIR="${NVM_DIR}"
-            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
-            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
 EOF
     
-    # Add code to update NVM ownership if UID/GID changes
+    # Add NVM init and add code to update NVM ownership if UID/GID changes
     tee -a /root/.bashrc /root/.zshrc /home/${USERNAME}/.bashrc >> /home/${USERNAME}/.zshrc \
 <<EOF
+            export NVM_DIR="${NVM_DIR}"
+            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
+            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
             if [ "\$(stat -c '%U' \$NVM_DIR)" != "${USERNAME}" ]; then
                 sudo chown -R ${USERNAME}:root \$NVM_DIR
             fi
diff --git a/containers/javascript-node/.devcontainer/library-scripts/node-debian.sh b/containers/javascript-node/.devcontainer/library-scripts/node-debian.sh
@@ -60,17 +60,16 @@ mkdir -p ${NVM_DIR}
 
 # Set up non-root user if applicable
 if [ "${USERNAME}" != "root" ] && id -u $USERNAME > /dev/null 2>&1; then
-    # Add NVM init to non-root user
     tee -a /home/${USERNAME}/.bashrc /home/${USERNAME}/.zshrc >> /root/.zshrc \
 << EOF
-            export NVM_DIR="${NVM_DIR}"
-            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
-            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
 EOF
     
-    # Add code to update NVM ownership if UID/GID changes
+    # Add NVM init and add code to update NVM ownership if UID/GID changes
     tee -a /root/.bashrc /root/.zshrc /home/${USERNAME}/.bashrc >> /home/${USERNAME}/.zshrc \
 <<EOF
+            export NVM_DIR="${NVM_DIR}"
+            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
+            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
             if [ "\$(stat -c '%U' \$NVM_DIR)" != "${USERNAME}" ]; then
                 sudo chown -R ${USERNAME}:root \$NVM_DIR
             fi
diff --git a/containers/php/.devcontainer/library-scripts/node-debian.sh b/containers/php/.devcontainer/library-scripts/node-debian.sh
@@ -60,17 +60,16 @@ mkdir -p ${NVM_DIR}
 
 # Set up non-root user if applicable
 if [ "${USERNAME}" != "root" ] && id -u $USERNAME > /dev/null 2>&1; then
-    # Add NVM init to non-root user
     tee -a /home/${USERNAME}/.bashrc /home/${USERNAME}/.zshrc >> /root/.zshrc \
 << EOF
-            export NVM_DIR="${NVM_DIR}"
-            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
-            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
 EOF
     
-    # Add code to update NVM ownership if UID/GID changes
+    # Add NVM init and add code to update NVM ownership if UID/GID changes
     tee -a /root/.bashrc /root/.zshrc /home/${USERNAME}/.bashrc >> /home/${USERNAME}/.zshrc \
 <<EOF
+            export NVM_DIR="${NVM_DIR}"
+            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
+            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
             if [ "\$(stat -c '%U' \$NVM_DIR)" != "${USERNAME}" ]; then
                 sudo chown -R ${USERNAME}:root \$NVM_DIR
             fi
diff --git a/containers/ruby/.devcontainer/library-scripts/node-debian.sh b/containers/ruby/.devcontainer/library-scripts/node-debian.sh
@@ -60,17 +60,16 @@ mkdir -p ${NVM_DIR}
 
 # Set up non-root user if applicable
 if [ "${USERNAME}" != "root" ] && id -u $USERNAME > /dev/null 2>&1; then
-    # Add NVM init to non-root user
     tee -a /home/${USERNAME}/.bashrc /home/${USERNAME}/.zshrc >> /root/.zshrc \
 << EOF
-            export NVM_DIR="${NVM_DIR}"
-            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
-            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
 EOF
     
-    # Add code to update NVM ownership if UID/GID changes
+    # Add NVM init and add code to update NVM ownership if UID/GID changes
     tee -a /root/.bashrc /root/.zshrc /home/${USERNAME}/.bashrc >> /home/${USERNAME}/.zshrc \
 <<EOF
+            export NVM_DIR="${NVM_DIR}"
+            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
+            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
             if [ "\$(stat -c '%U' \$NVM_DIR)" != "${USERNAME}" ]; then
                 sudo chown -R ${USERNAME}:root \$NVM_DIR
             fi
diff --git a/containers/swift/.devcontainer/library-scripts/node-debian.sh b/containers/swift/.devcontainer/library-scripts/node-debian.sh
@@ -60,17 +60,16 @@ mkdir -p ${NVM_DIR}
 
 # Set up non-root user if applicable
 if [ "${USERNAME}" != "root" ] && id -u $USERNAME > /dev/null 2>&1; then
-    # Add NVM init to non-root user
     tee -a /home/${USERNAME}/.bashrc /home/${USERNAME}/.zshrc >> /root/.zshrc \
 << EOF
-            export NVM_DIR="${NVM_DIR}"
-            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
-            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
 EOF
     
-    # Add code to update NVM ownership if UID/GID changes
+    # Add NVM init and add code to update NVM ownership if UID/GID changes
     tee -a /root/.bashrc /root/.zshrc /home/${USERNAME}/.bashrc >> /home/${USERNAME}/.zshrc \
 <<EOF
+            export NVM_DIR="${NVM_DIR}"
+            [ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh"
+            [ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion"
             if [ "\$(stat -c '%U' \$NVM_DIR)" != "${USERNAME}" ]; then
                 sudo chown -R ${USERNAME}:root \$NVM_DIR
             fi
