diff options
author | Marc Cornellà <hello@mcornella.com> | 2022-01-28 20:53:30 +0100 |
---|---|---|
committer | Marc Cornellà <hello@mcornella.com> | 2022-01-28 20:53:30 +0100 |
commit | 46f5d38b1dc6a725e78bd53ca35a6299b4e91ece (patch) | |
tree | 2c8b7bee2f851a898d16ef2da278cf178f1d8156 /tools | |
parent | 11a87eac47c579366620f995330532f47dc651f2 (diff) | |
download | zsh-46f5d38b1dc6a725e78bd53ca35a6299b4e91ece.tar.gz zsh-46f5d38b1dc6a725e78bd53ca35a6299b4e91ece.tar.bz2 zsh-46f5d38b1dc6a725e78bd53ca35a6299b4e91ece.zip |
refactor(installer): use POSIX-standard's `id -u -n` to define `$USER`
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/install.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/install.sh b/tools/install.sh index 2290bc1eb..e64e39063 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -37,6 +37,13 @@ # 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 custom_zsh=${ZSH:+yes} @@ -51,9 +58,6 @@ CHSH=${CHSH:-yes} RUNZSH=${RUNZSH:-yes} KEEP_ZSHRC=${KEEP_ZSHRC:-no} -# Sane defaults -USER=${USER:-$(whoami)} - command_exists() { command -v "$@" >/dev/null 2>&1 |