JSON Installer adjustments

This commit is contained in:
Akkadius 2017-07-24 22:56:57 -05:00
parent 6859d92716
commit dcfefee060
2 changed files with 2 additions and 3 deletions

View File

@ -692,7 +692,7 @@ sub do_install_config_json {
print $fh $json->pretty->utf8->encode($config);
close $fh;
unlink("eqemu_config_template.xml");
unlink("eqemu_config_template.json");
}
sub fetch_utility_scripts {
@ -1122,7 +1122,6 @@ sub read_eqemu_config_json {
$host = $config->{"server"}{"database"}{"host"};
$user = $config->{"server"}{"database"}{"username"};
$pass = $config->{"server"}{"database"}{"password"};
$long_name = $config->{"server"}{"world"}{"longname"};
}

View File

@ -600,7 +600,7 @@ void CheckForServerScript(bool force_download) {
#ifdef _WIN32
system("perl -MLWP::UserAgent -e \"require LWP::UserAgent; my $ua = LWP::UserAgent->new; $ua->timeout(10); $ua->env_proxy; my $response = $ua->get('https://raw.githubusercontent.com/EQEmu/Server/eqemu_config_json/utils/scripts/eqemu_server.pl'); if ($response->is_success){ open(FILE, '> eqemu_server.pl'); print FILE $response->decoded_content; close(FILE); }\"");
#else
system("wget --no-check-certificate -O eqemu_server.pl https://raw.githubusercontent.com/EQEmu/Server/eqemu_config_json/utils/scripts/eqemu_server.pl");
system("wget -N --no-check-certificate --quiet -O eqemu_server.pl https://raw.githubusercontent.com/EQEmu/Server/eqemu_config_json/utils/scripts/eqemu_server.pl");
#endif
}
}