diff options
author | tkrokli <tkrokli@hotmail.com> | 2015-10-10 16:04:58 +0200 |
---|---|---|
committer | tkrokli <tkrokli@hotmail.com> | 2015-10-10 16:04:58 +0200 |
commit | 01e0475ab898632bb9fd7c3ab0b11ddc6d5cee81 (patch) | |
tree | 05d24f4b5ba52f05a5aace232a4519834e5a33c6 /contrib | |
parent | 4e2dd6ee0ba1663df04e9fd36bc9ae616321e2a3 (diff) |
contrib/script: error text corrections in check_updates.sh
Fix a factual error in the /contrib/check_updates.sh error message text,
Best shown in an example from the latest travis build error:
```
$ ./contrib/check_updates.sh auth auth
Database Updater check script:
Checking database 'auth' for missing filenames in tables...
- "sql/updates/2015_10_09_00_auth.sql" is missing in table 'auth'.'updates'
Fatal error:
The Database Updater is broken for database 'auth
due to applied update which are missing in the 'auth'.'updates' table.
How to fix:
Insert the missing names of sql updates which were applied already to
the 'updates' table of the 'auth' base dump ('sql/base/auth_database.sql').
The command "./contrib/check_updates.sh auth auth" exited with 1.
```
Main fix: `\"sql/updates/${file}\"` -> `\"sql/updates/${name}/${file}\"`
Before this change, the error message claims that the updated SQL file was placed
directly in the `/sql/updates/` directory and not in the subdirectory based on its DB name.
All the other changes are improvements in English grammar and more precise description.
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/check_updates.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/check_updates.sh b/contrib/check_updates.sh index 97aa3dff7a8..017542eb807 100644 --- a/contrib/check_updates.sh +++ b/contrib/check_updates.sh @@ -22,7 +22,7 @@ do updates=$((updates+1)) else # The update isn't listed in the updates table of the given database. - echo "- \"sql/updates/${file}\" is missing in table '${name}'.'updates'" + echo "- \"sql/updates/${name}/${file}\" is missing in the '${name}'.'updates' table." error=1 fi done @@ -31,14 +31,14 @@ if [ ${error} -ne 0 ] then echo echo "Fatal error:" - echo " The Database Updater is broken for database '${name}" - echo " due to applied update which are missing in the '${name}'.'updates' table." + echo " The Database Updater is broken for the '${name}' database," + echo " because the applied update is missing in the '${name}'.'updates' table." echo echo "How to fix:" - echo " Insert the missing names of sql updates which were applied already to" - echo " the 'updates' table of the '${name}' base dump ('sql/base/${name}_database.sql')." + echo " Insert the missing names of the already applied sql updates" + echo " to the 'updates' table of the '${name}' base dump ('sql/base/${name}_database.sql')." exit 1 else - echo " Everything is ok, checked ${updates} updates." + echo " Everything is OK, finished checking ${updates} updates." exit 0 fi |