Don't use $HOSTNAME or call hostname(1), use $HOST instead!

diff --git a/bin/axttyinfo b/bin/axttyinfo
index 57c76c0b010dfba611f8b8bafacb3fa86ce183e0..6efd51d6019b2476eaf836a5fba98ab24712d5a4 100755 (executable)
--- a/bin/axttyinfo
+++ b/bin/axttyinfo
@@ -20,7 +20,7 @@ while [[ $# -gt 0 ]]; do
        shift
 done
 
-print -Pn -- "$fg[white]$FX[bold]$(hostname)$FX[no-bold] "
+print -Pn -- "$fg[white]$FX[bold]$HOST$FX[no-bold] "
 print -Pn -- "$fg[yellow]$(tty)$FX[reset], "
 print -Pn -- "$fg[green]$FX[underline]${TERM:-?}$FX[reset] "
 print -Pn -- "(${COLUMNS:-?}x${LINES:-?}); "

diff --git a/core/11_terminal/11_terminal.zshrc b/core/11_terminal/11_terminal.zshrc
index 33dafb1975c15e2235ae06a024b07b77670242ae..ac5a1fc037ebfa904228c7c2ce2da462c902bad9 100644 (file)
--- a/core/11_terminal/11_terminal.zshrc
+++ b/core/11_terminal/11_terminal.zshrc
@@ -97,7 +97,7 @@ function axzsh_terminal_title_precmd {
        if [[ "$TERM_PROGRAM" == "Apple_Terminal" && "$TERM" != "screen"* ]]; then
                axzsh_terminal_set_icon_title "$LOGNAME@$SHORT_HOST"
                # Update CWD in Terminal.app
-               local url=$(echo "file://$HOSTNAME$PWD" | sed -e 's| |%20|g')
+               local url=$(echo "file://$HOST$PWD" | sed -e 's| |%20|g')
                printf '\e]7;%s\a' "$url"
        else
                axzsh_terminal_set_icon_title "$LOGNAME@$SHORT_HOST:$PWD"

diff --git a/core/30_hostname/30_hostname.zprofile b/core/30_hostname/30_hostname.zprofile
index 5b2dbd3faa15899af1295095b6f2cfd451f0bdf1..e2d0699af2daf9a7064f1d2325e259bae58a5fe9 100644 (file)
--- a/core/30_hostname/30_hostname.zprofile
+++ b/core/30_hostname/30_hostname.zprofile
@@ -1,8 +1,8 @@
 # AX-ZSH: Alex' Modular ZSH Configuration
 # 30_hostname.zprofile: Initialize hostname settings
 
-# Setup "HOSTNAME" variable
-[[ -z "$HOSTNAME" ]] && HOSTNAME=$( hostname )
+# Setup legacy "HOSTNAME" variable (use "HOST"!)
+[[ -z "$HOSTNAME" ]] && HOSTNAME="$HOST"
 export HOSTNAME
 
 # Setup "SHORT_HOST" variable