Skip to content

Commit

Permalink
zshsrc: support hostnamectl iff hostname isn't present
Browse files Browse the repository at this point in the history
The hostname binary doesn't necessarily exist, while
hostnamectl is available.

Closes: #96
  • Loading branch information
mika committed May 26, 2020
1 parent 1d927f2 commit bb2b3f2
Showing 1 changed file with 18 additions and 3 deletions.
21 changes: 18 additions & 3 deletions etc/zsh/zshrc
Expand Up @@ -837,8 +837,16 @@ function grmlcomp () {
_ssh_hosts=()
_etc_hosts=()
fi

local localname
if check_com hostname ; then
localname=$(hostname)
elif check_com hostnamectl ; then
localname=$(hostnamectl --static)
fi

hosts=(
$(hostname)
"${localname}"
"$_ssh_config_hosts[@]"
"$_ssh_hosts[@]"
"$_etc_hosts[@]"
Expand Down Expand Up @@ -2509,8 +2517,15 @@ function grml_vcs_to_screen_title () {
}

function grml_maintain_name () {
# set hostname if not running on host with name 'grml'
if [[ -n "$HOSTNAME" ]] && [[ "$HOSTNAME" != $(hostname) ]] ; then
local localname
if check_com hostname ; then
localname=$(hostname)
elif check_com hostnamectl ; then
localname=$(hostnamectl --static)
fi

# set hostname if not running on local machine
if [[ -n "$HOSTNAME" ]] && [[ "$HOSTNAME" != "${localname}" ]] ; then
NAME="@$HOSTNAME"
fi
}
Expand Down

0 comments on commit bb2b3f2

Please sign in to comment.