diff options
author | Dominik Ritter <dritter03@googlemail.com> | 2015-09-04 17:39:28 +0300 |
---|---|---|
committer | Dominik Ritter <dritter03@googlemail.com> | 2015-09-04 17:39:28 +0300 |
commit | b8b82eee21f8e08fed8a1e9290c763d2c4d87293 (patch) | |
tree | 622bd4b8fae15236ac8fb958a7256c0b93506e17 | |
parent | 0f305043622b77ba803e748e16ad81e3c284e1ca (diff) |
Use the new `defined` function to test if a network interface was specified.
-rw-r--r-- | powerlevel9k.zsh-theme | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme index dea71e07..bd187a6f 100644 --- a/powerlevel9k.zsh-theme +++ b/powerlevel9k.zsh-theme @@ -579,28 +579,28 @@ prompt_icons_test() { prompt_ip() { if [[ "$OS" == "OSX" ]]; then - if [[ -z "$POWERLEVEL9K_IP_INTERFACE" ]]; then + if defined POWERLEVEL9K_IP_INTERFACE; then + # Get the IP address of the specified interface. + ip=$(ipconfig getifaddr $POWERLEVEL9K_IP_INTERFACE) + else local interfaces callback # Get network interface names ordered by service precedence. interfaces=$(networksetup -listnetworkserviceorder | grep -o "Device:\s*[a-z0-9]*" | grep -o -E '[a-z0-9]*$') callback='ipconfig getifaddr $item' ip=$(getRelevantItem $interfaces $callback) - else - # Get the IP address of the specified interface. - ip=$(ipconfig getifaddr $POWERLEVEL9K_IP_INTERFACE) fi else - if [[ -z "$POWERLEVEL9K_IP_INTERFACE" ]]; then + if defined POWERLEVEL9K_IP_INTERFACE; then + # Get the IP address of the specified interface. + ip=$(ip -4 a show $POWERLEVEL9K_IP_INTERFACE | grep -o "inet\s*[0-9.]*" | grep -o "[0-9.]*") + else local interfaces callback # Get all network interface names that are up interfaces=$(ip link ls up | grep -o -E ":\s+[a-z0-9]+:" | grep -v "lo" | grep -o "[a-z0-9]*") callback='ip -4 a show $item | grep -o "inet\s*[0-9.]*" | grep -o "[0-9.]*"' ip=$(getRelevantItem $interfaces $callback) - else - # Get the IP address of the specified interface. - ip=$(ip -4 a show $POWERLEVEL9K_IP_INTERFACE | grep -o "inet\s*[0-9.]*" | grep -o "[0-9.]*") fi fi |