Skip to content

O
oh-my-zsh
Unverified Commit 4f0b6802 authored by Marc Cornellà's avatar Marc Cornellà
Browse files
Options

fix(installer): fix `$HOME` setting if `getent` is not found (macOS)

Related: https://github.com/ohmyzsh/ohmyzsh/pull/10713/files#r820219899
parent 9350e1ff
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
tools/install.sh
View file @ 4f0b6802
...@@ -45,7 +45,9 @@ USER=${USER:-$(id -u -n)} ...@@ -45,7 +45,9 @@ USER=${USER:-$(id -u -n)}
# $HOME is defined at the time of login, but it could be unset. If it is unset, # $HOME is defined at the time of login, but it could be unset. If it is unset,
# a tilde by itself (~) will not be expanded to the current user's home directory. # a tilde by itself (~) will not be expanded to the current user's home directory.
# 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 | 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
HOME="${HOME:-$(eval echo ~$USER)}"
# Track if $ZSH was provided # Track if $ZSH was provided
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment