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

More tweaks [skip ci]

Browse Source
This commit is contained in:
Chris Miles 2020-05-11 03:35:16 -05:00 committed by GitHub
parent 51b98ec724
commit d534d345d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
utils/scripts/eqemu_server.pl
View File

@ -104,16 +104,24 @@ if (-e "eqemu_update.pl") {
print "[Info] For EQEmu Server management utilities - run eqemu_server.pl\n" if $ARGV[0] eq "ran_from_world"; print "[Info] For EQEmu Server management utilities - run eqemu_server.pl\n" if $ARGV[0] eq "ran_from_world";
check_db_version_table(); my $skip_checks = 0;
if ($ARGV[0] && $ARGV[0] eq "new_server") {
$skip_checks = 1;
}
#::: Check if db_version table exists... if ($skip_checks == 0) {
if (trim(get_mysql_result("SHOW COLUMNS FROM db_version LIKE 'Revision'")) ne "" && $db) { check_db_version_table();
#::: Check if db_version table exists...
if (trim(get_mysql_result("SHOW COLUMNS FROM db_version LIKE 'Revision'")) ne "" && $db) {
print get_mysql_result("DROP TABLE db_version"); print get_mysql_result("DROP TABLE db_version");
print "[Database] Old db_version table present, dropping...\n\n"; print "[Database] Old db_version table present, dropping...\n\n";
}
} }
check_for_world_bootup_database_update(); check_for_world_bootup_database_update();
sub urlencode sub urlencode
{ {
my ($rv) = @_; my ($rv) = @_;
@ -568,6 +576,9 @@ sub check_for_world_bootup_database_update
$world_path = "bin/world.exe"; $world_path = "bin/world.exe";
} }
$binary_database_version = 0;
$local_database_version = 0;
# Usually hit during installer when world hasn't been installed yet... # Usually hit during installer when world hasn't been installed yet...
if (-e $world_path) { if (-e $world_path) {
if ($OS eq "Windows") { if ($OS eq "Windows") {
@ -576,10 +587,10 @@ sub check_for_world_bootup_database_update
if ($OS eq "Linux") { if ($OS eq "Linux") {
@db_version = split(': ', `./$world_path db_version`); @db_version = split(': ', `./$world_path db_version`);
} }
}
$binary_database_version = trim($db_version[1]); $binary_database_version = trim($db_version[1]);
$local_database_version = get_main_db_version(); $local_database_version = get_main_db_version();
}
if ($binary_database_version == $local_database_version && $ARGV[0] eq "ran_from_world") { if ($binary_database_version == $local_database_version && $ARGV[0] eq "ran_from_world") {
print "[Update] Database up to date...\n"; print "[Update] Database up to date...\n";
@ -1704,8 +1715,8 @@ sub do_linux_login_server_setup
rmtree('updates_staged'); rmtree('updates_staged');
rmtree('db_update'); rmtree('db_update');
get_remote_file($install_repository_request_url . "linux/login_opcodes.conf", "login_opcodes.conf"); get_remote_file($install_repository_request_url . "linux/login_opcodes.conf", $opcodes_path . "login_opcodes.conf");
get_remote_file($install_repository_request_url . "linux/login_opcodes_sod.conf", "login_opcodes_sod.conf"); get_remote_file($install_repository_request_url . "linux/login_opcodes_sod.conf", $opcodes_path . "login_opcodes_sod.conf");
get_remote_file($install_repository_request_url . "linux/server_start_with_login.sh", "server_start_with_login.sh"); get_remote_file($install_repository_request_url . "linux/server_start_with_login.sh", "server_start_with_login.sh");
system("chmod 755 *.sh"); system("chmod 755 *.sh");