arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2025-01-11 00:20:55 +00:00
Code Issues Releases Wiki Activity

If ${USER} variable is blank, then populate it with whoami (#5341)

Browse Source
This commit is contained in:
Adam Warner 2023-07-18 09:12:25 +01:00 committed by GitHub
commit eda83a4141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pihole
View File

@ -544,6 +544,13 @@ if [[ ! $EUID -eq 0 && need_root -eq 1 ]];then
exit 1 exit 1
fi fi
fi fi
# In the case of alpine running in a container, the USER variable appears to be blank
# which prevents the next trap from working correctly. Set it by running whoami
if [[ -z ${USER} ]]; then
USER=$(whoami)
fi
# Can also be user pihole for other functions # Can also be user pihole for other functions
if [[ ${USER} != "pihole" && need_root -eq 0 ]];then if [[ ${USER} != "pihole" && need_root -eq 0 ]];then
if [[ -x "$(command -v sudo)" ]]; then if [[ -x "$(command -v sudo)" ]]; then