Changeset 32463

Timestamp:

2018-09-17T17:46:52+12:00 (6 years ago)

Author:

ak19

Message:

Need to get machine's external IP address from eth0 device, not the first device that ifconfig returns

Location:

main/trunk/greenstone3/bin/script

Files:

• IPv4.bat (modified) (2 diffs)
• IPv4.sh (modified) (1 diff)

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

@@ -39 +39 @@
 ::set result=^|%result%
 
+:: Echo a vertical bar up front, regardless of whether the result is empty
 echo ^|%result%
 goto fin
@@ -44 +45 @@
 
 :done
-:: Echo a vertical bar up front, regardless of whether the result is empty
 echo %result%
 

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

@@ -13 +13 @@
 # But need to still replace the . with \.
 
-#echo `ifconfig | grep "inet " | grep -v 127.0.0.1`|cut -d' ' -f 2|cut -d':' -f 2
+#echo `ifconfig eth0 | grep "inet " | grep -v 127.0.0.1`|cut -d' ' -f 2|cut -d':' -f 2
 
-tmp=`ifconfig | grep "inet " | grep -v 127.0.0.1`
+tmp=`ifconfig eth0 2>&1 | grep "inet " | grep -v 127.0.0.1`
+# 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 "|"
+fi
 
+# grab just the portion of the line we want
 tmp=`echo $tmp|cut -d' ' -f 2|cut -d':' -f 2`