From de38440c4f51998e65e4c26190c0029ae3bb3514 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Thu, 5 Sep 2019 19:53:19 -0500 Subject: [PATCH] Update eqemu_server.pl to use the bin folder if the binaries are being ran from them [skip ci] --- utils/scripts/eqemu_server.pl | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/utils/scripts/eqemu_server.pl b/utils/scripts/eqemu_server.pl index ef8b0babd..042c3d078 100644 --- a/utils/scripts/eqemu_server.pl +++ b/utils/scripts/eqemu_server.pl @@ -470,9 +470,19 @@ sub do_installer_routines { print `"$path" --host $host --user $user --password="$pass" -N -B -e "DROP DATABASE IF EXISTS $db_name;"`; print `"$path" --host $host --user $user --password="$pass" -N -B -e "CREATE DATABASE $db_name"`; + my $world_path = "world"; + if (-e "bin/world") { + $world_path = "bin/world"; + } + #::: Get Binary DB version - if ($OS eq "Windows") { @db_version = split(': ', `world db_version`); } - if ($OS eq "Linux") { @db_version = split(': ', `./world db_version`); } + if ($OS eq "Windows") { + @db_version = split(': ', `$world_path db_version`); + } + if ($OS eq "Linux") { + @db_version = split(': ', `./$world_path db_version`); + } + $binary_database_version = trim($db_version[1]); #::: Local DB Version