From 1fdc16d5848f31e2a1bdac415f2c55874693c2c7 Mon Sep 17 00:00:00 2001
From: inxi-svn <inxi-svn@techpatterns.com>
Date: Tue, 11 Nov 2008 18:47:00 +0000
Subject: [PATCH] (Change Version) Bug fix, removed scriptname from download
 path

---
 inxi | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/inxi b/inxi
index 606ef64..aa9f1e5 100755
--- a/inxi
+++ b/inxi
@@ -1,7 +1,7 @@
 #!/bin/bash
 ########################################################################
 ####  Script Name: inxi
-####  version: 0.5.10
+####  version: 0.5.11
 ####  Date: November 11 2008
 ########################################################################
 ####  inxi is a fork of infobash, the original bash sys info script by locsmif
@@ -547,7 +547,7 @@ get_parameters()
 				error_handler 4 "$OPTARG"
 			fi
 			;;
-		U)	script_self_updater "$SCRIPT_DOWNLOAD$SCRIPT_NAME" 'svn server'
+		U)	script_self_updater "$SCRIPT_DOWNLOAD" 'svn server'
 			;;
 		V)	print_version_info
 			exit 0
@@ -572,13 +572,13 @@ get_parameters()
 			case $OPTARG in
 				1)	B_TESTING_FLAG='true'
 					;;
-				2) script_self_updater "$SCRIPT_DOWNLOAD_DEV$SCRIPT_NAME" 'dev server'
+				2) script_self_updater "$SCRIPT_DOWNLOAD_DEV" 'dev server'
 					;;
 				http*)
 					# first test provided url to avoid overwriting file with null
 					wget --spider "$OPTARG$SCRIPT_NAME"
 					if [[ $? -eq 0 ]];then
-						script_self_updater "$OPTARG$SCRIPT_NAME" 'alt server'
+						script_self_updater "$OPTARG" 'alt server'
 					else
 						error_handler 10 "$OPTARG"
 					fi
@@ -668,11 +668,18 @@ script_self_updater()
 	print_screen_output "Starting $SCRIPT_NAME self updater."
 	print_screen_output "Currently running $SCRIPT_NAME version number: $SCRIPT_VERSION_NUMBER"
 	print_screen_output "Updating $SCRIPT_NAME in $SCRIPT_PATH using $2 as download source..."
-	wget -O $SCRIPT_PATH/$SCRIPT_NAME $1$SCRIPT_NAME || error_handler 8 "$?"
+	# first test if path is good
+	wget --spider $1$SCRIPT_NAME
+	# then do the actual download, need to make sure it's good because we're -O overwriting file
 	if [[ $? -eq 0 ]];then
-		SCRIPT_VERSION_NUMBER=$( grep -im 1 'version:' $SCRIPT_PATH/$SCRIPT_NAME | gawk '{print $3}' )
-		print_screen_output "Successfully updated to $2 version: $SCRIPT_VERSION_NUMBER\nTo run the new version, just start $SCRIPT_NAME again."
-		exit 0
+		wget -O $SCRIPT_PATH/$SCRIPT_NAME $1$SCRIPT_NAME || error_handler 8 "$?"
+		if [[ $? -eq 0 ]];then
+			SCRIPT_VERSION_NUMBER=$( grep -im 1 'version:' $SCRIPT_PATH/$SCRIPT_NAME | gawk '{print $3}' )
+			print_screen_output "Successfully updated to $2 version: $SCRIPT_VERSION_NUMBER\nTo run the new version, just start $SCRIPT_NAME again."
+			exit 0
+		fi
+	else
+		error_handler 8 "$?"
 	fi
 }