From 8a72e492fa0b0bed0b44b5630949a0695e9bcf57 Mon Sep 17 00:00:00 2001 From: Andreas Jonsson Date: Fri, 29 Mar 2019 16:43:01 +0100 Subject: [PATCH] Bug 23141: Add support for configuring database port in koha-dump, koha-mysql and koha-mysqlcheck --- debian/scripts/koha-dump | 1 + debian/scripts/koha-mysql | 3 ++- debian/scripts/koha-mysqlcheck | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/scripts/koha-dump b/debian/scripts/koha-dump index 7278a811e8..3c80131bf7 100755 --- a/debian/scripts/koha-dump +++ b/debian/scripts/koha-dump @@ -63,6 +63,7 @@ dump_instance() # Dump database. mysqlhost="$( xmlstarlet sel -t -v 'yazgfs/config/hostname' $kohaconfig )" + mysqlport="$( xmlstarlet sel -t -v 'yazgfs/config/port' $kohaconfig )" mysqldb="$( xmlstarlet sel -t -v 'yazgfs/config/database' $kohaconfig )" mysqluser="$( xmlstarlet sel -t -v 'yazgfs/config/user' $kohaconfig )" mysqlpass="$( xmlstarlet sel -t -v 'yazgfs/config/pass' $kohaconfig )" diff --git a/debian/scripts/koha-mysql b/debian/scripts/koha-mysql index 4a09e51c77..51ce44a8cb 100755 --- a/debian/scripts/koha-mysql +++ b/debian/scripts/koha-mysql @@ -51,10 +51,11 @@ shift # remove instance name from argument list. kohaconfig="/etc/koha/sites/$name/koha-conf.xml" mysqlhost="$( xmlstarlet sel -t -v 'yazgfs/config/hostname' $kohaconfig )" +mysqlport="$( xmlstarlet sel -t -v 'yazgfs/config/port' $kohaconfig )" mysqldb="$( xmlstarlet sel -t -v 'yazgfs/config/database' $kohaconfig )" mysqluser="$( xmlstarlet sel -t -v 'yazgfs/config/user' $kohaconfig )" mysqlpass="$( xmlstarlet sel -t -v 'yazgfs/config/pass' $kohaconfig )" -mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpass" \ +mysql --host="$mysqlhost" --port="$mysqlport" --user="$mysqluser" --password="$mysqlpass" \ "$mysqldb" "${@}" diff --git a/debian/scripts/koha-mysqlcheck b/debian/scripts/koha-mysqlcheck index d3b8363526..8da15927d0 100755 --- a/debian/scripts/koha-mysqlcheck +++ b/debian/scripts/koha-mysqlcheck @@ -44,8 +44,9 @@ kohaconfig="/etc/koha/sites/$name/koha-conf.xml" mysqlhost="$( xmlstarlet sel -t -v 'yazgfs/config/hostname' $kohaconfig )" mysqldb="$( xmlstarlet sel -t -v 'yazgfs/config/database' $kohaconfig )" +mysqlport="$( xmlstarlet sel -t -v 'yazgfs/config/port' $kohaconfig )" mysqluser="$( xmlstarlet sel -t -v 'yazgfs/config/user' $kohaconfig )" mysqlpass="$( xmlstarlet sel -t -v 'yazgfs/config/pass' $kohaconfig )" -mysqlcheck --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpass" \ +mysqlcheck --host="$mysqlhost" --port="$mysqlport" --user="$mysqluser" --password="$mysqlpass" \ $args "$mysqldb" -- 2.20.1