pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-11 11:12:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update eqemu_server.pl

Browse Source
This commit is contained in:
Chris Miles 2020-05-11 00:28:24 -05:00 committed by GitHub
parent 39cd5bb9a8
commit 496a958def
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
utils/scripts/eqemu_server.pl
View File

@ -479,10 +479,13 @@ sub do_installer_routines {
if (-e "bin/world") { if (-e "bin/world") {
$world_path = "bin/world"; $world_path = "bin/world";
} }
elsif (-e "bin/world.exe") {
$world_path = "bin/world.exe";
}
#::: Get Binary DB version #::: Get Binary DB version
if ($OS eq "Windows") { if ($OS eq "Windows") {
@db_version = split(': ', `$world_path db_version`); @db_version = split(': ', `"$world_path" db_version`);
} }
if ($OS eq "Linux") { if ($OS eq "Linux") {
@db_version = split(': ', `./$world_path db_version`); @db_version = split(': ', `./$world_path db_version`);
@ -522,10 +525,13 @@ sub check_for_world_bootup_database_update {
if (-e "bin/world") { if (-e "bin/world") {
$world_path = "bin/world"; $world_path = "bin/world";
} }
elsif (-e "bin/world.exe") {
$world_path = "bin/world.exe";
}
#::: Get Binary DB version #::: Get Binary DB version
if ($OS eq "Windows") { if ($OS eq "Windows") {
@db_version = split(': ', `$world_path db_version`); @db_version = split(': ', `"$world_path" db_version`);
} }
if ($OS eq "Linux") { if ($OS eq "Linux") {
@db_version = split(': ', `./$world_path db_version`); @db_version = split(': ', `./$world_path db_version`);
@ -1254,7 +1260,7 @@ sub get_remote_file {
$wget = `wget -N --no-cache --cache=no --no-check-certificate --quiet -O $destination_file $request_url`; $wget = `wget -N --no-cache --cache=no --no-check-certificate --quiet -O $destination_file $request_url`;
} }
elsif ($OS eq "Windows") { elsif ($OS eq "Windows") {
$wget = `powershell -Command "\$ProgressPreference = 'SilentlyContinue'; Invoke-RestMethod -ContentType \"application/octet-stream\" -Uri $request_url -OutFile $destination_file"`; $wget = `powershell -Command "\$ProgressPreference = 'SilentlyContinue'; Invoke-RestMethod -ContentType \"application/octet-stream\" -Uri $request_url -OutFile $destination_file"`
} }
print "[Download] Saved: (" . $destination_file . ") from " . $request_url . "\n" if !$silent_download; print "[Download] Saved: (" . $destination_file . ") from " . $request_url . "\n" if !$silent_download;
if (($OS eq "Linux" && $wget =~ /unable to resolve/i) || ($OS eq "Windows" && $wget =~ /404/i || $wget =~ /could not be resolved/i) ) { if (($OS eq "Linux" && $wget =~ /unable to resolve/i) || ($OS eq "Windows" && $wget =~ /404/i || $wget =~ /could not be resolved/i) ) {