Skip to content

Commit f0e6ba6

Browse files
authored
Ensure common-utils rc snippets end with newlines (#1100)
ensure common-utils rc snippets have line endings
1 parent 34c3a51 commit f0e6ba6

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
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.0",
3+
"version": "2.5.1",
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/scripts/bash_theme_snippet.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ if [[ "$TERM" == "xterm" ]]; then
4141

4242
# Append to PROMPT_COMMAND to call precmd before displaying the prompt
4343
PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND; }precmd"
44-
fi
44+
fi

src/common-utils/scripts/devcontainers.zsh-theme

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Oh My Zsh! theme - partly inspired by https://github.com/ohmyzsh/ohmyzsh/blob/master/themes/robbyrussell.zsh-theme
22
__zsh_prompt() {
33
local prompt_username
4-
if [ ! -z "${GITHUB_USER}" ]; then
4+
if [ ! -z "${GITHUB_USER}" ]; then
55
prompt_username="@${GITHUB_USER}"
66
else
77
prompt_username="%n"
@@ -42,4 +42,4 @@ if [[ "$TERM" == "xterm" ]]; then
4242
autoload -Uz add-zsh-hook
4343
add-zsh-hook preexec preexec
4444
add-zsh-hook precmd precmd
45-
fi
45+
fi

src/common-utils/scripts/rc_snippet.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ fi
1616
# Set the default git editor if not already set
1717
if [ -z "$(git config --get core.editor)" ] && [ -z "${GIT_EDITOR}" ]; then
1818
if [ "${TERM_PROGRAM}" = "vscode" ]; then
19-
if [[ -n $(command -v code-insiders) && -z $(command -v code) ]]; then
19+
if [[ -n $(command -v code-insiders) && -z $(command -v code) ]]; then
2020
export GIT_EDITOR="code-insiders --wait"
21-
else
21+
else
2222
export GIT_EDITOR="code --wait"
2323
fi
2424
fi

0 commit comments

Comments
 (0)