Skip to content

Commit 849a5e2

Browse files
dhhyiAlvaroRausell
andauthored
[common-utils] use new ohmyzsh setting to disable auto update (#1424)
* Use new config to disable OhMyZsh auto update There's a new method: https://github.com/ohmyzsh/ohmyzsh/wiki/Settings#deprecated-settings * bump patch version * Remove `buster` from testing scenarios as it is EOL --------- Co-authored-by: Álvaro Rausell Guiard <[email protected]>
1 parent b9c09c4 commit 849a5e2

File tree

4 files changed

+2
-23
lines changed

4 files changed

+2
-23
lines changed

src/common-utils/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "common-utils",
3-
"version": "2.5.3",
3+
"version": "2.5.4",
44
"name": "Common Utilities",
55
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
66
"description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",

src/common-utils/main.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ if [ "${INSTALL_ZSH}" = "true" ]; then
558558
# Add devcontainer .zshrc template
559559
if [ "$INSTALL_OH_MY_ZSH_CONFIG" = "true" ]; then
560560
if ! [ -f "${template_path}" ] || ! grep -qF "$(head -n 1 "${template_path}")" "${user_rc_file}"; then
561-
echo -e "$(cat "${template_path}")\nDISABLE_AUTO_UPDATE=true\nDISABLE_UPDATE_PROMPT=true" > ${user_rc_file}
561+
echo -e "$(cat "${template_path}")\nzstyle ':omz:update' mode disabled" > ${user_rc_file}
562562
fi
563563
sed -i -e 's/ZSH_THEME=.*/ZSH_THEME="devcontainers"/g' ${user_rc_file}
564564
fi

test/common-utils/buster.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

test/common-utils/scenarios.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@
1313
"common-utils": {}
1414
}
1515
},
16-
"buster": {
17-
"image": "debian:buster",
18-
"remoteUser": "devcontainer",
19-
"features": {
20-
"common-utils": {}
21-
}
22-
},
2316
"bullseye": {
2417
"image": "debian:bullseye",
2518
"remoteUser": "devcontainer",

0 commit comments

Comments
 (0)