Changeset 32664 for main/trunk/greenstone3/bin/script/IPv4.sh

Timestamp:

2018-12-07T18:17:09+13:00 (5 years ago)

Author:

ak19

Message:

On Kathy's machine, there is no eth0, as the default ethernet device has a different name, so doing ifconfig eth0 to get IPv4 address doesn't work. But on her machine, the older code that did just ifconfig to get the IPv4 does work, so using this method as a fallback.

File:

• main/trunk/greenstone3/bin/script/IPv4.sh (modified) (1 diff)

main/trunk/greenstone3/bin/script/IPv4.sh

@@ -18 +18 @@
 # As below: if $tmp is empty, can just return |, as that doesn't really matter. Will be consistent with windows
 if [[ $tmp = *"Device not found"* ]] || [[ -z "${tmp// }" ]]; then
-    echo "|"
+    # eth0 is not found on Kathy's machine where the default ethernet device has a different name
+    # But ifconfig on its own works there, so try that next
+    tmp=`ifconfig 2>&1 | grep "inet " | grep -v 127.0.0.1`
+    if [[ $tmp = *"Device not found"* ]] || [[ -z "${tmp// }" ]]; then
+    echo "|"
+    fi
 fi