diff options
| author | Josh Spicer <joshspicer@github.com> | 2023-12-07 21:49:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-07 21:49:18 +0300 |
| commit | 3ea4d6bbd7864bcf7b5a91fdeeb66e4f5a6f46c0 (patch) | |
| tree | 79585189b1dc389a703c8b9a1a9553a2fcd4c8c6 | |
| parent | def3a41f576ceffebdff8266b41b8589a2512ac2 (diff) | |
Fix `.zprofile` is owned by root (#775)feature_common-utils_2.3.1
* revert behavior of sourcing .profile in .zprofile
https://github.com/devcontainers/features/pull/736/files#diff-3e71c0a0669a0410f7dd0d8f2b83f3b6bf6b525d3eabd354f19f32822da669fcR460-R463
* add test
* increment version
* create empty .zprofile is not present, and fix test
* temporarily add back .profile to .zprofile (only if file did not exist)
| -rw-r--r-- | src/common-utils/devcontainer-feature.json | 2 | ||||
| -rw-r--r-- | src/common-utils/main.sh | 6 | ||||
| -rw-r--r-- | test/common-utils/configure_zsh_as_default_shell.sh | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/common-utils/devcontainer-feature.json b/src/common-utils/devcontainer-feature.json index dc54e69..329f8de 100644 --- a/src/common-utils/devcontainer-feature.json +++ b/src/common-utils/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "common-utils", - "version": "2.3.0", + "version": "2.3.1", "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 index a291f98..26f0a75 100644 --- a/src/common-utils/main.sh +++ b/src/common-utils/main.sh @@ -459,8 +459,10 @@ fi # Optionally configure zsh and Oh My Zsh! if [ "${INSTALL_ZSH}" = "true" ]; then - if [ ! -f "${user_home}/.zprofile" ] || ! grep -Fxq 'source $HOME/.profile' "${user_home}/.zprofile" ; then - echo 'source $HOME/.profile' >> "${user_home}/.zprofile" + if [ ! -f "${user_home}/.zprofile" ]; then + touch "${user_home}/.zprofile" + echo 'source $HOME/.profile' >> "${user_home}/.zprofile" # TODO: Reconsider adding '.profile' to '.zprofile' + chown ${USERNAME}:${group_name} "${user_home}/.zprofile" fi if [ "${ZSH_ALREADY_INSTALLED}" != "true" ]; then diff --git a/test/common-utils/configure_zsh_as_default_shell.sh b/test/common-utils/configure_zsh_as_default_shell.sh index 01d1522..21b1210 100644 --- a/test/common-utils/configure_zsh_as_default_shell.sh +++ b/test/common-utils/configure_zsh_as_default_shell.sh @@ -11,5 +11,7 @@ check "default-shell-is-zsh" bash -c "getent passwd $(whoami) | awk -F: '{ print check "default-zshrc-is-dev-container-template" bash -c "cat ~/.zshrc | grep ZSH_THEME | grep devcontainers" check "zsh-path-contains-local-bin" zsh -l -c "echo $PATH | grep '/home/devcontainer/.local/bin'" +check "Ensure .zprofile is owned by remoteUser" bash -c "stat -c '%U' /home/devcontainer/.zprofile | grep devcontainer" + # Report result reportResults |