diff --git a/inxi b/inxi index df69872..504b54a 100755 --- a/inxi +++ b/inxi @@ -2,7 +2,7 @@ ######################################################################## SELF_NAME='inxi' # don't quote the following, parsers grab these too -SELF_VERSION=2.3.46 +SELF_VERSION=2.3.47 SELF_DATE=2017-11-26 SELF_PATCH=00 ######################################################################## @@ -1618,6 +1618,7 @@ create_rotate_logfiles() script_self_updater() { eval $LOGFS + set_downloader local downloader_error=0 file_contents='' downloader_man_error=0 local man_file_location=$( set_man_location ) local man_file_path="$man_file_location/inxi.1.gz" @@ -1626,7 +1627,6 @@ script_self_updater() print_screen_output "Sorry, you can't run the $SELF_NAME self updater option (-$3) in an IRC client." exit 1 fi - print_screen_output "Starting $SELF_NAME self updater." print_screen_output "Currently running $SELF_NAME version number: $SELF_VERSION" print_screen_output "Current version patch number: $SELF_PATCH" @@ -1634,7 +1634,7 @@ script_self_updater() print_screen_output "Updating $SELF_NAME in $SELF_PATH using $2 as download source..." case $DOWNLOADER in curl) - file_contents="$( curl $NO_SSL_OPT -s $1$SELF_NAME )" || downloader_error=$? + file_contents="$( curl $NO_SSL_OPT -L -s $1$SELF_NAME )" || downloader_error=$? ;; fetch) file_contents="$( fetch $NO_SSL_OPT -q -o - $1$SELF_NAME )" || downloader_error=$? @@ -1697,7 +1697,7 @@ script_self_updater() print_screen_output "Downloading Man page file now." case $DOWNLOADER in curl) - curl $NO_SSL_OPT -s -o $man_file_path $MAN_FILE_DOWNLOAD || downloader_man_error=$? + curl $NO_SSL_OPT -L -s -o $man_file_path $MAN_FILE_DOWNLOAD || downloader_man_error=$? ;; fetch) fetch $NO_SSL_OPT -q -o $man_file_path $MAN_FILE_DOWNLOAD || downloader_man_error=$? @@ -8762,7 +8762,7 @@ get_networking_wan_ip_data() if [[ -n $( grep 'smxi.org' <<< $WAN_IP_URL ) ]];then ua="-A s-tools/inxi-ip" fi - ip_data="$( curl $NO_SSL_OPT $ua -y $DL_TIMEOUT -s $WAN_IP_URL )" || downloader_error=$? + ip_data="$( curl $NO_SSL_OPT $ua -L -y $DL_TIMEOUT -s $WAN_IP_URL )" || downloader_error=$? ;; fetch) ip_data="$( fetch $NO_SSL_OPT -T $DL_TIMEOUT -q -o - $WAN_IP_URL )" || downloader_error=$? @@ -12141,7 +12141,7 @@ get_weather_data() if [[ $b_test_loc != 'true' ]];then case $DOWNLOADER in curl) - location_data="$( curl $NO_SSL_OPT -y $DL_TIMEOUT -s $location_site )" || downloader_error=$? + location_data="$( curl $NO_SSL_OPT -L -y $DL_TIMEOUT -s $location_site )" || downloader_error=$? ;; fetch) location_data="$( fetch $NO_SSL_OPT -T $DL_TIMEOUT -q -o - $location_site )" || downloader_error=$? @@ -12281,7 +12281,7 @@ get_weather_data() if [[ $b_test_weather != 'true' ]];then case $DOWNLOADER in curl) - weather_data="$( curl $NO_SSL_OPT -y $DL_TIMEOUT -s $weather_feed"$location" )" || downloader_error=$? + weather_data="$( curl $NO_SSL_OPT -L -y $DL_TIMEOUT -s $weather_feed"$location" )" || downloader_error=$? ;; fetch) weather_data="$( fetch $NO_SSL_OPT -T $DL_TIMEOUT -q -o - $weather_feed"$location" )" || downloader_error=$? diff --git a/inxi.changelog b/inxi.changelog index ea8c3f7..d29c316 100644 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,3 +1,18 @@ +===================================================================================== +Version: 2.3.47 +Patch Version: 00 +Script Date: 2017-11-26 +----------------------------------- +Changes: +----------------------------------- + +New version, new tarball. Bug fix for Curl, in some cases it may hit a redirect, +so I added the -L flag to follow redirects. + +Make sure to update to this version or various downloader actions could fail. +----------------------------------- +-- Harald Hope - Sun, 26 Nov 2017 18:30:35 -0800 + ===================================================================================== Version: 2.3.46 Patch Version: 00