Commonutils: chown: cannot access '/home/vscode/.zshrc': No such file…

… or directory (#662) * Update main.sh * Update devcontainer-feature.json * Test install as non root user. --------- Co-authored-by: Samruddhi Khandale <[email protected]>
devcontainers · Aug 25, 2023 · 0668db5 · 0668db5
1 parent 0cf690e
commit 0668db5
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "common-utils",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "name": "Common Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",

diff --git a/src/common-utils/main.sh b/src/common-utils/main.sh
@@ -500,7 +500,7 @@ if [ "${INSTALL_ZSH}" = "true" ]; then
             copy_to_user_files=("${oh_my_install_dir}")
             [ -f "$user_rc_file" ] && copy_to_user_files+=("$user_rc_file")
             cp -rf "${copy_to_user_files[@]}" /root
-            chown -R ${USERNAME}:${group_name} "${oh_my_install_dir}" "${user_rc_file}"
+            chown -R ${USERNAME}:${group_name} "${copy_to_user_files[@]}"
         fi
     fi
 fi

diff --git a/test/common-utils/configure_zsh_no_template_first_step.sh b/test/common-utils/configure_zsh_no_template_first_step.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "default-zsh-with-no-zshrc" bash -c "[ ! -e ~/.zshrc ]"
+
+# Report result
+reportResults
diff --git a/...common-utils/configure_zsh_no_template.sh → .../configure_zsh_no_template_second_step.sh b/...common-utils/configure_zsh_no_template.sh → .../configure_zsh_no_template_second_step.sh
@@ -4,12 +4,11 @@ set -e
 
 # Optional: Import test library
 source dev-container-features-test-lib
-
 # Definition specific tests
 function file_not_overridden() {
-    cat ~/.zshrc | grep 'alias fnomockalias=' | grep testingmock
+    cat $1 | grep 'alias fnomockalias=' | grep testingmock
 }
-check "default-zsh-with-no-zshrc" file_not_overridden
+check "default-zsh-with-no-zshrc" file_not_overridden /home/devcontainer/.zshrc
 
 # Report result
 reportResults
diff --git a/test/common-utils/scenarios.json b/test/common-utils/scenarios.json
@@ -115,10 +115,20 @@
             }
         }
     },
-    "configure_zsh_no_template": {
+    "configure_zsh_no_template_second_step": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
-        "postCreateCommand": "echo alias fnomockalias=testingmock >> /root/.zshrc",
-        "remoteUser": "root",
+        "postCreateCommand": "echo alias fnomockalias=testingmock >> /home/devcontainer/.zshrc",
+        "remoteUser": "devcontainer",
+        "features": {
+            "common-utils": {
+                "installZsh": true,
+                "installOhMyZshConfig": false
+            }
+        }
+    },
+    "configure_zsh_no_template_first_step": {
+        "image": "debian:bullseye",
+        "remoteUser": "devcontainer",
         "features": {
             "common-utils": {
                 "installZsh": true,