zeaslity/ohmyzsh
0
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-07-03 10:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(install): quote vars and defensive programming (#13840)

Browse Source
This commit is contained in:
Sri Harsha Ponukumati
2026-06-26 08:07:51 -07:00
committed by GitHub
parent ff1df9a039
commit d2379b2701
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/install.sh
View File

@@ -51,7 +51,7 @@ USER=${USER:-$(id -u -n)}
# POSIX: https://pubs.opengroup.org/onlinepubs/009696899/basedefs/xbd_chap08.html#tag_08_03 # 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)}" HOME="${HOME:-$(getent passwd $USER 2>/dev/null | cut -d: -f6)}"
# macOS does not have getent, but this works even if $HOME is unset # 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 # Track if $ZSH was provided
@@ -344,7 +344,7 @@ setup_zshrc() {
return return
fi fi
if [ $OVERWRITE_CONFIRMATION != "no" ]; then if [ "$OVERWRITE_CONFIRMATION" != "no" ]; then
# Ask user for confirmation before backing up and overwriting # Ask user for confirmation before backing up and overwriting
echo "${FMT_YELLOW}Found ${zdot}/.zshrc." echo "${FMT_YELLOW}Found ${zdot}/.zshrc."
echo "The existing .zshrc will be backed up to .zshrc.pre-oh-my-zsh if overwritten." echo "The existing .zshrc will be backed up to .zshrc.pre-oh-my-zsh if overwritten."
@@ -475,12 +475,14 @@ EOF
if user_can_sudo; then if user_can_sudo; then
sudo -k >/dev/null 2>&1 || true # -k forces the password prompt when supported sudo -k >/dev/null 2>&1 || true # -k forces the password prompt when supported
sudo chsh -s "$zsh" "$USER" sudo chsh -s "$zsh" "$USER"
chsh_status=$?
else else
chsh -s "$zsh" "$USER" # run chsh normally chsh -s "$zsh" "$USER" # run chsh normally
chsh_status=$?
fi fi
# Check if the shell change was successful # 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." fmt_error "chsh command unsuccessful. Change your default shell manually."
else else
export SHELL="$zsh" export SHELL="$zsh"