From e8ca3f694204e3e6f487ba2fb53452cc9d9f8a53 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Fri, 20 Jan 2023 12:56:37 -0600 Subject: [PATCH] [eqemu_server.pl Swap out binary source --- utils/scripts/eqemu_server.pl | 72 ++--------------------------------- 1 file changed, 3 insertions(+), 69 deletions(-) diff --git a/utils/scripts/eqemu_server.pl b/utils/scripts/eqemu_server.pl index d67dc25cb..9d6c3bf34 100755 --- a/utils/scripts/eqemu_server.pl +++ b/utils/scripts/eqemu_server.pl @@ -1559,14 +1559,14 @@ sub copy_file sub fetch_latest_windows_appveyor { print "[Update] Fetching Latest Windows Binaries (unstable) from Appveyor... \n"; - get_remote_file("https://ci.appveyor.com/api/projects/KimLS/server-pglwk/artifacts/build_x64.zip", - "updates_staged/build_x64.zip", + get_remote_file("https://github.com/eqemu/server/releases/latest/download/eqemu-server-windows-x64.zip", + "updates_staged/eqemu-server-windows-x64.zip", 1 ); print "[Update] Fetched Latest Windows Binaries (unstable) from Appveyor... \n"; print "[Update] Extracting... --- \n"; - unzip('updates_staged/build_x64.zip', 'updates_staged/binaries/'); + unzip('updates_staged/eqemu-server-windows-x64.zip', 'updates_staged/binaries/'); my @files; my $start_dir = "updates_staged/binaries"; find( @@ -1584,33 +1584,6 @@ sub fetch_latest_windows_appveyor rmtree('updates_staged'); } -sub fetch_latest_windows_appveyor_bots -{ - print "[Update] Fetching Latest Windows Binaries with Bots (unstable) from Appveyor... \n"; - get_remote_file("https://ci.appveyor.com/api/projects/KimLS/server-87crp/artifacts/build_x64.zip", - "updates_staged/eqemu-x64-bots.zip", - 1); - - print "[Update] Fetched Latest Windows Binaries (unstable) from Appveyor... \n"; - print "[Update] Extracting... --- \n"; - unzip('updates_staged/eqemu-x64-bots.zip', 'updates_staged/binaries/'); - my @files; - my $start_dir = "updates_staged/binaries"; - find( - sub { push @files, $File::Find::name unless -d; }, - $start_dir - ); - for my $file (@files) { - $destination_file = $file; - $destination_file =~ s/updates_staged\/binaries\///g; - print "[Update] Installing [" . $bin_dir . $destination_file . "]\n"; - copy_file($file, $bin_dir . $destination_file); - } - print "[Update] Done\n"; - - rmtree('updates_staged'); -} - sub do_windows_login_server_setup { print "[Install] Pulling down Loginserver database tables...\n"; @@ -1832,45 +1805,6 @@ sub map_files_fetch_bulk unlink('maps/maps.zip'); } -sub map_files_fetch -{ - print "[Install] Fetching Latest Maps --- \n"; - - get_remote_file("https://raw.githubusercontent.com/Akkadius/EQEmuMaps/master/!eqemu_maps_manifest.txt", - "updates_staged/eqemu_maps_manifest.txt"); - - #::: Get Data from manifest - open(FILE, "updates_staged/eqemu_maps_manifest.txt"); - $i = 0; - while () { - chomp; - $o = $_; - @manifest_map_data = split(',', $o); - if ($manifest_map_data[0] ne "") { - $maps_manifest[$i] = [ $manifest_map_data[0], $manifest_map_data[1] ]; - $i++; - } - } - - #::: Download - $fc = 0; - for ($m = 0; $m <= $i; $m++) { - my $file_existing = $maps_manifest[$m][0]; - my $file_existing_size = (stat $file_existing)[7]; - if ($file_existing_size != $maps_manifest[$m][1]) { - print "[Install] Updating: '" . $maps_manifest[$m][0] . "'\n"; - get_remote_file("https://raw.githubusercontent.com/Akkadius/EQEmuMaps/master/" . $maps_manifest[$m][0], - $maps_manifest[$m][0], - 1); - $fc++; - } - } - - if ($fc == 0) { - print "[Install] No Map Updates found... \n\n"; - } -} - sub quest_files_fetch { if (!-e "updates_staged/projecteqquests-master/") {