Merge pull request #2743 from docwhat/issue-2155-scutil
Trust but verify 'scutil' to return ComputerName
This commit is contained in:
commit
dd644a1fa9
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user