diff --git a/setup/tools/clisetup/build.func.php b/setup/tools/clisetup/build.func.php index dbafb511..3b715b41 100644 --- a/setup/tools/clisetup/build.func.php +++ b/setup/tools/clisetup/build.func.php @@ -81,7 +81,7 @@ function build($syncMe = null) else CLISetup::log('finished file generation with errors', CLISetup::LOG_ERROR); } - else + else if ($syncMe) CLISetup::log('no valid script names supplied', CLISetup::LOG_ERROR); return $done; diff --git a/setup/tools/clisetup/firstrun.func.php b/setup/tools/clisetup/firstrun.func.php index 14a563ac..6a18bc78 100644 --- a/setup/tools/clisetup/firstrun.func.php +++ b/setup/tools/clisetup/firstrun.func.php @@ -74,6 +74,8 @@ function firstrun() ['SqlGen::generate', 'itemset', null, null, null], ['SqlGen::generate', 'item_stats', null, null, null], ['SqlGen::generate', 'source', null, null, null], + ['SqlGen::generate', 'sounds', null, null, null], + ['FileGen::generate', 'soundfiles', null, null, null], ['FileGen::generate', 'searchplugin', null, null, null], ['FileGen::generate', 'power', null, null, null], ['FileGen::generate', 'searchboxScript', null, null, null], diff --git a/setup/tools/clisetup/sql.func.php b/setup/tools/clisetup/sql.func.php index 0a1efb6e..5ac98fc0 100644 --- a/setup/tools/clisetup/sql.func.php +++ b/setup/tools/clisetup/sql.func.php @@ -47,7 +47,7 @@ function sql($syncMe = null) else CLISetup::log('finished sql generation with errors', CLISetup::LOG_ERROR); } - else + else if ($syncMe) CLISetup::log('no valid script names supplied', CLISetup::LOG_ERROR); return $done; diff --git a/setup/tools/filegen/soundfiles.func.php b/setup/tools/filegen/soundfiles.func.php index 621b985c..06ae33d2 100644 --- a/setup/tools/filegen/soundfiles.func.php +++ b/setup/tools/filegen/soundfiles.func.php @@ -22,6 +22,7 @@ if (!CLI) { $i = 0; CLISetup::log(' - '.$itr.'/'.$nFiles.' ('.(intVal(100 * $itr / $nFiles).'%) done')); + DB::Aowow()->selectCell('SELECT 1'); // keep mysql busy or it may go away } if (stristr($filePath, '.wav')) // expected file.wav.ogg diff --git a/setup/tools/sqlgen/sounds.func.php b/setup/tools/sqlgen/sounds.func.php index bba88142..24175e32 100644 --- a/setup/tools/sqlgen/sounds.func.php +++ b/setup/tools/sqlgen/sounds.func.php @@ -48,7 +48,8 @@ function sounds(/*array $ids = [] */) CLISetup::log(' - sounds main data'); - // file extraction and conversion in build step. data here is purely structural + // file extraction and conversion manually + // moving files in build step. data here is purely structural // reality check ... thats probably gigabytes worth of sound.. only growing in size with every locale added on top (RedRocketSite didn't do it. Should i then?) // .wav => audio/ogg; codecs="vorbis" diff --git a/setup/updates/1488745158_02.sql b/setup/updates/1488745158_02.sql index 9fbb753f..bd0f6c06 100644 --- a/setup/updates/1488745158_02.sql +++ b/setup/updates/1488745158_02.sql @@ -161,4 +161,4 @@ CREATE TABLE IF NOT EXISTS `aowow_spell_sounds` ( /*!40014 SET FOREIGN_KEY_CHECKS=IF(@OLD_FOREIGN_KEY_CHECKS IS NULL, 1, @OLD_FOREIGN_KEY_CHECKS) */; /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -UPDATE aowow_dbversion SET `build` = CONCAT(IFNULL(`build`, ''), ' sounds'), `sql` = CONCAT(IFNULL(`sql`, ''), ' spell creature sounds spawns'); +UPDATE aowow_dbversion SET `build` = CONCAT(IFNULL(`build`, ''), ' soundfiles'), `sql` = CONCAT(IFNULL(`sql`, ''), ' spell creature sounds spawns');