mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-12-23 12:51:58 +00:00
refactor(installer): use POSIX-standard's id -u -n
to define $USER
This commit is contained in:
parent
11a87eac47
commit
46f5d38b1d
1 changed files with 7 additions and 3 deletions
|
@ -37,6 +37,13 @@
|
||||||
#
|
#
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
# Make sure important variables exist if not already defined
|
||||||
|
#
|
||||||
|
# $USER is defined by login(1) which is not always executed (e.g. containers)
|
||||||
|
# POSIX: https://pubs.opengroup.org/onlinepubs/009695299/utilities/id.html
|
||||||
|
USER=${USER:-$(id -u -n)}
|
||||||
|
|
||||||
|
|
||||||
# Track if $ZSH was provided
|
# Track if $ZSH was provided
|
||||||
custom_zsh=${ZSH:+yes}
|
custom_zsh=${ZSH:+yes}
|
||||||
|
|
||||||
|
@ -51,9 +58,6 @@ CHSH=${CHSH:-yes}
|
||||||
RUNZSH=${RUNZSH:-yes}
|
RUNZSH=${RUNZSH:-yes}
|
||||||
KEEP_ZSHRC=${KEEP_ZSHRC:-no}
|
KEEP_ZSHRC=${KEEP_ZSHRC:-no}
|
||||||
|
|
||||||
# Sane defaults
|
|
||||||
USER=${USER:-$(whoami)}
|
|
||||||
|
|
||||||
|
|
||||||
command_exists() {
|
command_exists() {
|
||||||
command -v "$@" >/dev/null 2>&1
|
command -v "$@" >/dev/null 2>&1
|
||||||
|
|
Loading…
Reference in a new issue