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

Merge pull request #1068 from alimalkhalifa/reintroduce_wget_to_windows_installer

Browse Source 
Revert back to using wget.exe for windows installs
This commit is contained in:
Chris Miles 2020-05-23 16:23:57 -05:00 committed by GitHub
commit 4603fa2ef8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utils/scripts/eqemu_server.pl
View File

@ -1371,11 +1371,10 @@ 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 = $wget = `bin\\wget.exe -N --no-cache --cache=no --no-check-certificate --quiet -O $destination_file $request_url`;
`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 ($wget =~ /unable to resolve/i) {
print "Error, no connection or failed request...\n\n"; print "Error, no connection or failed request...\n\n";
#die; #die;
} }