Trust but verify 'scutil' to return ComputerName

Apparently, it is possible to set up a Mac such that `scutil --get ComputerName` hasn't been set. This change checks if that fails and falls back to the original mechanism. Closes #2155 Closes #2183

Trust but verify 'scutil' to return ComputerName
00b21d5a · Christian Höltje · Christian Höltje · 207b6a1e · 00b21d5a
Commit 00b21d5a authored Apr 23, 2014 by Christian Höltje Committed by Christian Höltje Jul 23, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

oh-my-zsh.sh oh-my-zsh.sh +3 -3

No files found.
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -38,9 +38,9 @@ for plugin ($plugins); do
 done

 # Figure out the SHORT hostname
-if [ -n "$commands[scutil]" ]; then
-  # OS X
-  SHORT_HOST=$(scutil --get ComputerName)
+if [[ "$OSTYPE" = darwin* ]]; then
+  # OS X's $HOST changes with dhcp, etc. Use ComputerName if possible.
+  SHORT_HOST=$(scutil --get ComputerName 2>/dev/null) || SHORT_HOST=${HOST/.*/}
 else
  SHORT_HOST=${HOST/.*/}
 fi