diff options
| author | Naios <naios-dev@live.de> | 2016-04-17 17:14:29 +0200 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-04-17 17:36:40 +0200 |
| commit | e3a583646edd736176e5b4614b69fa794bc83c5b (patch) | |
| tree | ad617ddf514aa7ba033c7834db39c7f66ec9972d | |
| parent | 9701fca7dff0611556e7029874c70a5507c9ca0e (diff) | |
Contrib: Fix the check_update scripts after the recent organization changes
* Fixes the travis build
* Ref 8778829a98e3d605
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | contrib/check_updates.sh | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 9e2c252cf4d..3edd9096ca8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,15 +25,15 @@ install: - cd bin - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS="dynamic" -DSERVERS=1 -DNOJEM=1 -DWITH_DYNAMIC_LINKING=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_INSTALL_PREFIX=check_install - cd .. - - sudo chmod +x contrib/check_updates.sh + - chmod +x contrib/check_updates.sh script: - $CXX --version - mysql -uroot < sql/create/create_mysql.sql - mysql -utrinity -ptrinity auth < sql/base/auth_database.sql - - ./contrib/check_updates.sh auth auth + - ./contrib/check_updates.sh auth 6.x auth - mysql -utrinity -ptrinity characters < sql/base/characters_database.sql - - ./contrib/check_updates.sh characters characters + - ./contrib/check_updates.sh characters 6.x characters - mysql -utrinity -ptrinity world < sql/base/dev/world_database.sql - mysql -utrinity -ptrinity hotfixes < sql/base/dev/hotfixes_database.sql - cat sql/updates/world/*.sql | mysql -utrinity -ptrinity world diff --git a/contrib/check_updates.sh b/contrib/check_updates.sh index 017542eb807..6c33d07ae8b 100644 --- a/contrib/check_updates.sh +++ b/contrib/check_updates.sh @@ -1,6 +1,7 @@ #!/bin/sh name=$1 -database=$2 +branch=$2 +database=$3 echo "Database Updater check script:" echo " Checking database '${name}' for missing filenames in tables..." @@ -9,7 +10,7 @@ echo # Select all entries which are in the updates table entries=$(mysql -uroot ${database} -e "SELECT name FROM updates" | grep ".sql") -cd sql/updates/${name} +cd sql/updates/${name}/${branch} error=0 updates=0 |