46f5d38b1dc6a725e78bd53ca35a6299b4e91ece
- Author
- Marc Cornellà <hello@mcornella.com>
- Committer
- Marc Cornellà <hello@mcornella.com>
- Date
Message
refactor(installer): use POSIX-standard's `id -u -n` to define `$USER`
Diff
1diff --git a/tools/install.sh b/tools/install.sh
2index 2290bc1eb771c5a1c2534bde7a9926f2028f907e..e64e3906397f606fd8e46d2c6d3b67298b7d7684 100755
3--- a/tools/install.sh
4+++ b/tools/install.sh
5@@ -37,6 +37,13 @@
6 #
7 set -e
8
9+# Make sure important variables exist if not already defined
10+#
11+# $USER is defined by login(1) which is not always executed (e.g. containers)
12+# POSIX: https://pubs.opengroup.org/onlinepubs/009695299/utilities/id.html
13+USER=${USER:-$(id -u -n)}
14+
15+
16 # Track if $ZSH was provided
17 custom_zsh=${ZSH:+yes}
18
19@@ -51,9 +58,6 @@ CHSH=${CHSH:-yes}
20 RUNZSH=${RUNZSH:-yes}
21 KEEP_ZSHRC=${KEEP_ZSHRC:-no}
22
23-# Sane defaults
24-USER=${USER:-$(whoami)}
25-
26
27 command_exists() {
28 command -v "$@" >/dev/null 2>&1