Skip to content
Snippets Groups Projects
Unverified Commit f3eff4e9 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

EHN: use .config in patch_header.sh

parent f97acfda
No related branches found
No related tags found
No related merge requests found
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
# ** end header # ** end header
# #
#header for patch scripts #header for patch scripts
CMD_MYSQL=mysql source .config
CMD_MYSQL_DUMP=mysqldump
USAGE="$1 --database=DATABASE_NAME [ --login-path=LOGIN_PATH | --user=USER [ --password=PASSWORD ] ]\n\n" USAGE="$1 --database=DATABASE_NAME [ --login-path=LOGIN_PATH | --user=USER [ --password=PASSWORD ] ]\n\n"
CMD_OPTIONS="options:\n\n-h, --help\n\tShow brief help.\n-l LOGIN_PATH, --login-path=LOGIN_PATH\n\tA login-path for the mysql connection (see 'man mysql' and 'man mysql-config-editor').\n-u USER, --user=USER\n\tA mysql user.\n-p PASSWORD, --password=PASSWORD\n\tThe password for the mysql user.\n" CMD_OPTIONS="options:\n\n-h, --help\n\tShow brief help.\n-l LOGIN_PATH, --login-path=LOGIN_PATH\n\tA login-path for the mysql connection (see 'man mysql' and 'man mysql-config-editor').\n-u USER, --user=USER\n\tA mysql user.\n-p PASSWORD, --password=PASSWORD\n\tThe password for the mysql user.\n"
set -e set -e
...@@ -155,7 +154,7 @@ function uptodate { ...@@ -155,7 +154,7 @@ function uptodate {
# @param $1: db version string, e.g. v2.0.0 # @param $1: db version string, e.g. v2.0.0
# @return: 0 on success, 1 on failure # @return: 0 on success, 1 on failure
function check_version { function check_version {
local version=$($CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE_NAME -B -e "Select CaosDBVersion();") local version=$($MYSQL_CMD $MYSQL_CONNECTION -D $DATABASE_NAME -B -e "Select CaosDBVersion();")
if [[ "$(echo $version | sed 's/^CaosDBVersion()\s//')" = "$1" ]]; then if [[ "$(echo $version | sed 's/^CaosDBVersion()\s//')" = "$1" ]]; then
return 0 return 0
fi fi
...@@ -168,13 +167,13 @@ function update_version { ...@@ -168,13 +167,13 @@ function update_version {
} }
function dump_table { function dump_table {
$CMD_MYSQL_DUMP $MYSQL_CONNECTION $DATABASE_NAME $1 > ${DATABASE_NAME}.${1}.${OLD_VERSION}.dump.sql $MYSQLDUMP_CMD $MYSQL_CONNECTION $DATABASE_NAME $1 > ${DATABASE_NAME}.${1}.${OLD_VERSION}.dump.sql
} }
function mysql_execute { function mysql_execute {
set +e set +e
$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE_NAME -e "$1" $MYSQL_CMD $MYSQL_CONNECTION -D $DATABASE_NAME -e "$1"
ret=${PIPESTATUS[0]} ret=${PIPESTATUS[0]}
if [ "$ret" -ne 0 ]; then if [ "$ret" -ne 0 ]; then
failure "MYSQL ERROR" failure "MYSQL ERROR"
...@@ -183,5 +182,5 @@ function mysql_execute { ...@@ -183,5 +182,5 @@ function mysql_execute {
} }
function redo_table { function redo_table {
$CMD_MYSQL $MYSQL_CONNECTION -D $DATABASE_NAME < ${DATABASE_NAME}.${1}.${OLD_VERSION}.dump.sql $MYSQL_CMD $MYSQL_CONNECTION -D $DATABASE_NAME < ${DATABASE_NAME}.${1}.${OLD_VERSION}.dump.sql
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment