From bd48efcdd50a698ad540368491c05d4a951879cb Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sun, 16 Nov 2014 05:31:19 -0600 Subject: [PATCH] db_update.pl changes --- utils/scripts/db_update.pl | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/utils/scripts/db_update.pl b/utils/scripts/db_update.pl index e1c03f871..33a493cd1 100644 --- a/utils/scripts/db_update.pl +++ b/utils/scripts/db_update.pl @@ -20,9 +20,9 @@ while() { elsif(/(.*)<\/db>/i) { $db = $1; } } -print " -============================================================ -# EQEmu: Automatic Database Upgrade Check # +print +"============================================================ + EQEmu: Automatic Database Upgrade Check ============================================================ "; @@ -89,15 +89,19 @@ if(GetMySQLResult("SHOW TABLES LIKE 'db_version'") eq ""){ @db_version = split(': ', `world db_version`); $bin_db_ver = trim($db_version[1]); $local_db_ver = trim(GetMySQLResult("SELECT `version` FROM `db_version` LIMIT 1")); -print "Binary Database Version is: (" . $bin_db_ver . ")\n"; -print "Local Database Version is: (" . $local_db_ver . ")\n\n"; +print " Binary Database Version: (" . $bin_db_ver . ")\n"; +print " Local Database Version: (" . $local_db_ver . ")\n\n"; #::: If World ran this script, and our version is up to date, continue... -if($bin_db_ver == $local_db_ver && $ARGV[0] eq "ran_from_world"){ exit; } +if($bin_db_ver == $local_db_ver && $ARGV[0] eq "ran_from_world"){ + print " Database up to Date: Continuing World Bootup...\n"; + print "============================================================\n"; + exit; +} print "Retrieving latest database manifest...\n"; -GetRemoteFile("https://raw.githubusercontent.com/EQEmu/Server/master/utils/sql/db_update_manifest.txt", "db_update/db_update_manifest.txt"); -# GetRemoteFile("https://dl.dropboxusercontent.com/u/50023467/dl/db_update_manifest.txt", "db_update/db_update_manifest.txt"); +#GetRemoteFile("https://raw.githubusercontent.com/EQEmu/Server/master/utils/sql/db_update_manifest.txt", "db_update/db_update_manifest.txt"); +GetRemoteFile("https://dl.dropboxusercontent.com/u/50023467/dl/db_update_manifest.txt", "db_update/db_update_manifest.txt"); if($local_db_ver < $bin_db_ver){ print "You have missing database updates, type 1 or 2 to backup your database before running them as recommended...\n\n"; @@ -248,6 +252,7 @@ sub Run_Database_Check{ $file_name = trim($m_d{$val}[1]); print "Running Update: " . $val . " - " . $file_name . "\n"; print GetMySQLResultFromFile("db_update/$file_name"); + print GetMySQLResult("UPDATE `db_version` SET `version` = $val"); } return; } @@ -351,4 +356,6 @@ sub print_match_debug{ sub print_break{ if(!$debug){ return; } print "\n==============================================\n"; -} \ No newline at end of file +} + +if($ARGV[0] eq "ran_from_world"){ print "Continuing World Bootup...\n"; } \ No newline at end of file