pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 18:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change our web request references to master now that we are merged

Browse Source
This commit is contained in:
Akkadius 2018-01-13 17:22:27 -06:00
parent 92e20d07ae
commit a5e65b93c9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/scripts/eqemu_server.pl
View File

@ -303,12 +303,12 @@ sub check_xml_to_json_conversion {
if(-e "eqemu_config.xml" && !-e "eqemu_config.json") { if(-e "eqemu_config.xml" && !-e "eqemu_config.json") {
if($OS eq "Windows"){ if($OS eq "Windows"){
get_remote_file("https://raw.githubusercontent.com/EQEmu/Server/eqemu_config_json/utils/xmltojson/xmltojson-windows-x86.exe", "xmltojson.exe"); get_remote_file("https://raw.githubusercontent.com/EQEmu/Server/master/utils/xmltojson/xmltojson-windows-x86.exe", "xmltojson.exe");
print "Converting eqemu_config.xml to eqemu_config.json\n"; print "Converting eqemu_config.xml to eqemu_config.json\n";
print `xmltojson eqemu_config.xml`; print `xmltojson eqemu_config.xml`;
} }
if($OS eq "Linux"){ if($OS eq "Linux"){
get_remote_file("https://raw.githubusercontent.com/EQEmu/Server/eqemu_config_json/utils/xmltojson/xmltojson-linux-x86", "xmltojson"); get_remote_file("https://raw.githubusercontent.com/EQEmu/Server/master/utils/xmltojson/xmltojson-linux-x86", "xmltojson");
print "Converting eqemu_config.xml to eqemu_config.json\n"; print "Converting eqemu_config.xml to eqemu_config.json\n";
print `chmod 755 xmltojson`; print `chmod 755 xmltojson`;
print `./xmltojson eqemu_config.xml`; print `./xmltojson eqemu_config.xml`;

4
world/net.cpp
View File

@ -608,9 +608,9 @@ void CheckForServerScript(bool force_download) {
std::cout << "Pulling down EQEmu Server Maintenance Script (eqemu_server.pl)..." << std::endl; std::cout << "Pulling down EQEmu Server Maintenance Script (eqemu_server.pl)..." << std::endl;
#ifdef _WIN32 #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); }\""); 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/master/utils/scripts/eqemu_server.pl'); if ($response->is_success){ open(FILE, '> eqemu_server.pl'); print FILE $response->decoded_content; close(FILE); }\"");
#else #else
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"); system("wget -N --no-check-certificate --quiet -O eqemu_server.pl https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl");
#endif #endif
} }
} }