Resolve merge conflict in gitea update script

This commit is contained in:
Tracey Clark 2019-03-29 08:56:48 -05:00
commit b49d8f2324

View file

@ -72,8 +72,8 @@ my $bz = new IO::Compress::Bzip2 $temp_out
# need to do in OO way
# https://metacpan.org/pod/IO::Compress::Bzip2
print $bz $gitea_bin; # This writes the filename as string to the bz
$bz->close();
#print $bz $gitea_bin; # This writes the filename as string to the bz
#$bz->close();
my $baseURL = q{https://github.com/go-gitea/gitea/};
my $latestURL = q{https://api.github.com/repos/go-gitea/gitea/releases/latest};
@ -81,7 +81,6 @@ my $latestURL = q{https://api.github.com/repos/go-gitea/gitea/releases/latest};
# https://hubpages.com/technology/Use-Perl-to-access-REST-API
# Spin up the browser object (via LWP::UserAgent)
my $ua = LWP::UserAgent->new(
#ssl_opts => { verify_hostname => 0 }, # not worried about SSL certs
cookie_jar => {}, # keep cookies in RAM but not persistent between sessions
);