Skip to content

[pull] master from ohmyzsh:master #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jun 26, 2026
Merged

[pull] master from ohmyzsh:master #237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions tools/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ USER=${USER:-$(id -u -n)}
# POSIX: https://pubs.opengroup.org/onlinepubs/009696899/basedefs/xbd_chap08.html#tag_08_03
HOME="${HOME:-$(getent passwd $USER 2>/dev/null | cut -d: -f6)}"
# macOS does not have getent, but this works even if $HOME is unset
HOME="${HOME:-$(eval echo ~$USER)}"
HOME="${HOME:-$(eval echo ~"$USER")}"


# Track if $ZSH was provided
Expand Down Expand Up @@ -344,7 +344,7 @@ setup_zshrc() {
return
fi

if [ $OVERWRITE_CONFIRMATION != "no" ]; then
if [ "$OVERWRITE_CONFIRMATION" != "no" ]; then
# Ask user for confirmation before backing up and overwriting
echo "${FMT_YELLOW}Found ${zdot}/.zshrc."
echo "The existing .zshrc will be backed up to .zshrc.pre-oh-my-zsh if overwritten."
Expand Down Expand Up @@ -475,12 +475,14 @@ EOF
if user_can_sudo; then
sudo -k >/dev/null 2>&1 || true # -k forces the password prompt when supported
sudo chsh -s "$zsh" "$USER"
chsh_status=$?
else
chsh -s "$zsh" "$USER" # run chsh normally
chsh_status=$?
fi

# Check if the shell change was successful
if [ $? -ne 0 ]; then
if [ "$chsh_status" -ne 0 ]; then
fmt_error "chsh command unsuccessful. Change your default shell manually."
else
export SHELL="$zsh"
Expand Down