From 496a958defc916d4d17469e864ad729ebdfe34f1 Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Mon, 11 May 2020 00:28:24 -0500 Subject: [PATCH] Update eqemu_server.pl --- utils/scripts/eqemu_server.pl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/utils/scripts/eqemu_server.pl b/utils/scripts/eqemu_server.pl index c2bec1816..c6eff474d 100755 --- a/utils/scripts/eqemu_server.pl +++ b/utils/scripts/eqemu_server.pl @@ -479,10 +479,13 @@ sub do_installer_routines { if (-e "bin/world") { $world_path = "bin/world"; } + elsif (-e "bin/world.exe") { + $world_path = "bin/world.exe"; + } #::: Get Binary DB version if ($OS eq "Windows") { - @db_version = split(': ', `$world_path db_version`); + @db_version = split(': ', `"$world_path" db_version`); } if ($OS eq "Linux") { @db_version = split(': ', `./$world_path db_version`); @@ -522,10 +525,13 @@ sub check_for_world_bootup_database_update { if (-e "bin/world") { $world_path = "bin/world"; } + elsif (-e "bin/world.exe") { + $world_path = "bin/world.exe"; + } #::: Get Binary DB version if ($OS eq "Windows") { - @db_version = split(': ', `$world_path db_version`); + @db_version = split(': ', `"$world_path" db_version`); } if ($OS eq "Linux") { @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`; } 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; if (($OS eq "Linux" && $wget =~ /unable to resolve/i) || ($OS eq "Windows" && $wget =~ /404/i || $wget =~ /could not be resolved/i) ) {