From a5e65b93c95c42a1431528565c2d55f95c603b18 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sat, 13 Jan 2018 17:22:27 -0600 Subject: [PATCH] Change our web request references to master now that we are merged --- utils/scripts/eqemu_server.pl | 4 ++-- world/net.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/scripts/eqemu_server.pl b/utils/scripts/eqemu_server.pl index 3467b1ae6..d9df40c05 100644 --- a/utils/scripts/eqemu_server.pl +++ b/utils/scripts/eqemu_server.pl @@ -303,12 +303,12 @@ sub check_xml_to_json_conversion { if(-e "eqemu_config.xml" && !-e "eqemu_config.json") { 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 `xmltojson eqemu_config.xml`; } 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 `chmod 755 xmltojson`; print `./xmltojson eqemu_config.xml`; diff --git a/world/net.cpp b/world/net.cpp index 367f3e5f8..033f470f7 100644 --- a/world/net.cpp +++ b/world/net.cpp @@ -608,9 +608,9 @@ void CheckForServerScript(bool force_download) { std::cout << "Pulling down EQEmu Server Maintenance Script (eqemu_server.pl)..." << std::endl; #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 - 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 } } \ No newline at end of file