Customization/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-22 05:40:08 +00:00
Code Releases Activity

Trust but verify 'scutil' to return ComputerName

Browse source 
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
This commit is contained in:
Christian Höltje 2014-04-23 09:41:09 -04:00 committed by Christian Höltje
parent 207b6a1e33
commit 00b21d5ac3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
oh-my-zsh.sh
View file

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