From 421ecfd4304cdfb27704d9a57b11f1939abf277f Mon Sep 17 00:00:00 2001
From: inxi-svn <inxi-svn@techpatterns.com>
Date: Sat, 18 May 2013 04:37:24 +0000
Subject: [PATCH] trying a patch fix for slow remote connections

---
 inxi | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/inxi b/inxi
index cf5cc96..e664329 100755
--- a/inxi
+++ b/inxi
@@ -3,7 +3,7 @@
 ####  Script Name: inxi
 ####  Version: 1.9.02
 ####  Date: May 17 2013
-####  Patch Number: 00
+####  Patch Number: 01
 ########################################################################
 ####  SPECIAL THANKS
 ########################################################################
@@ -5825,7 +5825,7 @@ get_networking_wan_ip_data()
 	# awk has bad regex handling so checking it with grep -E instead
 	# ip=$( echo  2001:0db8:85a3:0000:0000:8a2e:0370:7334 | gawk  --re-interval '
 	# ip=$( wget -q -O - $WAN_IP_URL | gawk  --re-interval '
-	ip=$( wget -t 1 -T 4 -q -O - $WAN_IP_URL | gawk  --re-interval '
+	ip=$( wget -t 1 -T 6 -q -O - $WAN_IP_URL | gawk  --re-interval '
 	{
 		#gsub("\n","",$2")
 		print $NF
@@ -7983,10 +7983,10 @@ get_weather_data()
 	else
 		if [[ $b_test_loc != 'true' ]];then
 			# make sure location site is up
-			wget -q -t 1 -T 5 --spider $location_site || wget_error=$?
+			wget -q -t 1 -T 8 --spider $location_site || wget_error=$?
 			# grab the location xml file
 			if [[ $wget_error -eq 0 ]];then
-				location_data=$( wget -q -t 1 -T 5 -O- $location_site || wget_error=$? )
+				location_data=$( wget -q -t 1 -T 8 -O- $location_site || wget_error=$? )
 			else
 				data_grab_error="Error: unable to connect to location server - wget: $wget_error"
 			fi
@@ -8000,7 +8000,9 @@ get_weather_data()
 				data_grab_error="Error: location xml local file not found."
 			fi
 		fi
-		if [[ -z $( grep -i '<Response' <<< $location_data ) ]];then
+		if [[ -n $data_grab_error ]];then
+			:
+		elif [[ -z $( grep -i '<Response' <<< $location_data ) ]];then
 			data_grab_error="Error: location downloaded but data contains no xml."
 		else
 			# clean up xml and make easy to process with newlines, note, bsd sed has no support for inserting
@@ -8093,7 +8095,7 @@ get_weather_data()
 		echo "location: $location"
 	fi
 	
-	if [[ -z $location ]];then
+	if [[ -z $location && -z $data_grab_error ]];then
 		data_grab_error="Error: location data downloaded but no location detected."
 	fi
 	
@@ -8102,10 +8104,10 @@ get_weather_data()
 		A_WEATHER_DATA=$data_grab_error
 	else
 		if [[ $b_test_weather != 'true' ]];then
-			wget -q -t 1 -T 5 --spider $weather_spider || wget_error=$?
+			wget -q -t 1 -T 8 --spider $weather_spider || wget_error=$?
 			# grab the weather feed xml file
 			if [[ $wget_error -eq 0 ]];then
-				weather_data="$( wget -q -t 1 -T 5 -O- $weather_feed"$location" || wget_error=$? )"
+				weather_data="$( wget -q -t 1 -T 8 -O- $weather_feed"$location" || wget_error=$? )"
 			else
 				data_grab_error="Error: unable to connect to weather server - wget: $wget_error"
 			fi