diff --git a/inxi b/inxi index d05eb0b..344cbef 100755 --- a/inxi +++ b/inxi @@ -2,8 +2,8 @@ ######################################################################## SELF_NAME='inxi' # don't quote the following, parsers grab these too -SELF_VERSION=2.3.42 -SELF_DATE=2017-10-30 +SELF_VERSION=2.3.43 +SELF_DATE=2017-10-31 SELF_PATCH=00 ######################################################################## #### SPECIAL THANKS @@ -2187,7 +2187,7 @@ debug_data_collector() use File::Find; use strict; # use warnings; - use 5.010; + use 5.008; my @content = (); find( \&wanted, "/sys"); process_data( @content ); @@ -2335,19 +2335,19 @@ upload_debugger_data() echo "Required Perl module Net::FTP not installed." return 3 fi - export debugger_file echo "Starting Perl Uploader..." result="$( perl -e ' use strict; use warnings; + use 5.008; use Net::FTP; my ($ftp, $host, $user, $pass, $dir, $fpath, $error); $host = "ftp.techpatterns.com"; $user = "anonymous"; $pass = "anonymous\@techpatterns.com"; $dir = "incoming"; - $fpath = $ENV{debugger_file}; + $fpath = $ARGV[0]; # NOTE: important: must explicitly set to passive true/1 $ftp = Net::FTP->new($host, Debug => 0, Passive => 1); $ftp->login($user, $pass) || die $ftp->message; @@ -2356,9 +2356,9 @@ upload_debugger_data() print "Connected to FTP server.\n"; $ftp->put($fpath) || die $ftp->message; $ftp->quit; - print "Uploaded file.\n"; + print "Uploaded file $fpath.\n"; print $ftp->message; - ' )" + ' $debugger_file )" echo "$result" if [[ "$result" == *Goodbye* ]];then diff --git a/inxi.changelog b/inxi.changelog index 6d62a4b..adaf67e 100644 --- a/inxi.changelog +++ b/inxi.changelog @@ -1,3 +1,15 @@ +===================================================================================== +Version: 2.3.43 +Patch Version: 00 +Script Date: 2017-10-31 +----------------------------------- +Changes: +----------------------------------- +New version, tarball. Small perl fix, nothing changes in output or function. + +----------------------------------- +-- Harald Hope - Tue, 31 Oct 2017 17:30:03 -0700 + ===================================================================================== Version: 2.3.42 Patch Version: 00