dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2025-01-19 00:47:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Change Version)

Browse source 
Bug fix, removed scriptname from download path
This commit is contained in:
inxi-svn 2008-11-11 18:47:00 +00:00
parent df2d91cb37
commit 1fdc16d584
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
inxi
View file

@ -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
}