fix: use /etc/hostname

master
David Kebler 2023-03-19 12:12:18 -07:00
parent 2c73b1dc8d
commit ba63cf586c
1 changed files with 1 additions and 5 deletions

View File

@ -90,11 +90,7 @@ BASH_SHELL_ANY_NETWORK=$parent/any/network
export BASH_SHELL_DIRS export BASH_SHELL_DIRS
# machine specific shell # machine specific shell
<<<<<<< HEAD BASH_SHELL_HOST="$parent/$([[ -f /etc/hostname ]] && cat /etc/hostname || echo nohostname)"
BASH_SHELL_HOST="$parent/$([[ -f /etc/host ]] && cat /etc/host || echo nohostname)
=======
BASH_SHELL_HOST="$parent/$([[ -f /etc/host ]] && cat /etc/host || echo nohostname)"
>>>>>>> d70e9dc (fix handle no /etc/host file like inside docker container)
# BASH_SHELL_HOST=<some directory> # BASH_SHELL_HOST=<some directory>
# if there is a host directory add it to list and export env var # if there is a host directory add it to list and export env var
# [[ -d $BASH_SHELL_HOST ]] && BASH_SHELL_DIRS+="$BASH_SHELL_HOST " && export BASH_SHELL_HOST # [[ -d $BASH_SHELL_HOST ]] && BASH_SHELL_DIRS+="$BASH_SHELL_HOST " && export BASH_SHELL_HOST