diff --git a/.travis.yml b/.travis.yml index 48a09bc..c1bdf66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,8 @@ sudo: 'required' notifications: email: - on_success: always + on_success: never + on_failure: always slack: secure: mSj4SYM4weApU3Ct+nqdaHkLw0J/q5+VH1q0LYnviZ06UpRU/N6lricfu9ihgND2VJ+cwfuQpAegdI1cDFzxDRpZpnzU9Db4N7OW5cDkb8eHpy6XhjQYi5KqWfgamh2UwiqYGgoQBc4gXhGDlChjJQopM+qPesHO9y/ucFAjxdlkEHVdZKNYDiVfiOKCGBzDuP+PbOPiZiqQFBgmFs1YLLrrQ7y5dgdoiai2I72MAN0kngoNB9ZsUgtQ63WTdgPKJOiX+oQMMXgYoP0+9iIhS6/cKHs64Z7jPreYYuWWMTnQPdvaIgh4ASIhUE6FVI5SdFxmajVik8SMlRK1rQApQLJ9wOJammUJHCSI4jfEVQ5H2og9R3+BA0qspBQVZXMTCYfX10Up1tmL+Kev1Za335v2z046gzX4aTiWBxi1I9mYmnYKQiGuaIG5crkPodIAeS9HX/DulMUhPRpa0Djwi7ZJlCAzfuEGDgAlWt/oWfIw66unTY/G6cEaxeEbZ3Ho+bPy48dRxhYW5kRHR1OuHqqfNULYeAGm6AIF3ng+2GjvXh6rhqmstBh/myROqM3X7ofUzEJRo9ow+hDroZLE4mfavn4UAnQybN7FfzuJiOoYTmcws7JzYD8b/G+Aynjw04m0ojDDJN0fVgQ+qltMoCfFMhx8FscF/QjGo/T/zc4= template: diff --git a/bin/database.sh b/bin/database.sh index d65070d..489c38b 100755 --- a/bin/database.sh +++ b/bin/database.sh @@ -6,6 +6,7 @@ SQL_DB='' SQL_USER='' SQL_PASS='' ANY="'%'" +SET_OK=0 help_message(){ echo 'Command [-domain xxx]' @@ -43,9 +44,11 @@ trans_name(){ } display_credential(){ - echo "Database: ${SQL_DB}" - echo "Username: ${SQL_USER}" - echo "Password: $(echo ${SQL_PASS} | tr -d "'")" + if [ ${SET_OK} = 0 ]; then + echo "Database: ${SQL_DB}" + echo "Username: ${SQL_USER}" + echo "Password: $(echo ${SQL_PASS} | tr -d "'")" + fi exit 0 } @@ -54,7 +57,8 @@ add_sql_client(){ } check_db_access(){ - docker-compose exec mysql su -c "mysql -uroot -p${MYSQL_ROOT_PASSWORD} -e 'status'" + add_sql_client + docker-compose exec mysql su -c "mysql -uroot -p${MYSQL_ROOT_PASSWORD} -e 'status'" >/dev/null 2>&1 if [ ${?} != 0 ]; then echo "DB access failed, please check!" exit 1 @@ -66,6 +70,7 @@ db_setup(){ -e "CREATE DATABASE '${SQL_DB}';" \ -e "GRANT ALL PRIVILEGES ON '${SQL_DB}'.* TO '${SQL_USER}'@'${ANY}' IDENTIFIED BY '${SQL_PASS}';" \ -e "FLUSH PRIVILEGES;"' + SET_OK=${?} } auto_setup_main(){ @@ -73,12 +78,14 @@ auto_setup_main(){ gen_pass trans_name ${DOMAIN} auto_name + check_db_access db_setup display_credential } specify_setup_main(){ specify_name + check_db_access db_setup display_credential }