From a00cb84da48b1f53a67c0ed43c90e6b4f720262f Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Mon, 4 Feb 2019 15:40:31 +0100 Subject: [PATCH] Fix regular expression and test --- functions/utilities.zsh | 2 +- test/segments/ip.spec | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/functions/utilities.zsh b/functions/utilities.zsh index 9a72eab8..5532eef6 100755 --- a/functions/utilities.zsh +++ b/functions/utilities.zsh @@ -402,7 +402,7 @@ function p9k::parseIp() { for interfaceName in $relevantInterfaces; do local interface="$(${ROOT_PREFIX}/sbin/ifconfig $interfaceName 2>/dev/null)" # Check if interface is UP. - if [[ "${interface/${newline}/}" =~ "]*>(.*?)inet[ ]*([^ ]*)" ]]; then + if [[ "${interface/${newline}/}" =~ "]*>(.*)inet[ ]*([^ ]*)" ]]; then echo "${match[3]}" return 0 fi diff --git a/test/segments/ip.spec b/test/segments/ip.spec index 9fb0bddb..2dce55f7 100755 --- a/test/segments/ip.spec +++ b/test/segments/ip.spec @@ -212,6 +212,8 @@ function testIpSegmentWorksOnOsxWithNoInterfaceSpecified() { function testIpSegmentWorksOnOsxWithInterfaceSpecified() { fakeIfconfig "eth1" + local POWERLEVEL9K_IP_INTERFACE="eth1" + # Load Powerlevel9k source powerlevel9k.zsh-theme local OS='OSX' # Fake OSX @@ -232,6 +234,8 @@ function testIpSegmentWorksOnLinuxWithNoInterfaceSpecified() { function testIpSegmentWorksOnLinuxWithInterfaceSpecified() { fakeIp "eth3" + local POWERLEVEL9K_IP_INTERFACE="eth3" + # Load Powerlevel9k source powerlevel9k.zsh-theme local OS='Linux' # Fake Linux