Merge branch 'main' into python-introduce_packages_option
This commit is contained in:
commit
d77c9ed548
3 changed files with 15 additions and 9 deletions
|
@ -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.",
|
||||
|
|
|
@ -222,7 +222,9 @@ install_redhat_packages() {
|
|||
package_list="${package_list} zsh"
|
||||
fi
|
||||
|
||||
if [ -n "${package_list}" ]; then
|
||||
${install_cmd} -y install ${package_list}
|
||||
fi
|
||||
|
||||
# Get to latest versions of all packages
|
||||
if [ "${UPGRADE_PACKAGES}" = "true" ]; then
|
||||
|
@ -457,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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue