@@ -, +, @@ --- debian/scripts/koha-mysql | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) --- a/debian/scripts/koha-mysql +++ a/debian/scripts/koha-mysql @@ -17,6 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +set -e umask 0077 # include helper functions @@ -48,20 +49,17 @@ is_instance "$name" || ( usage; die "Unknown instance '$name'" ) shift # remove instance name from argument list. kohaconfig="/etc/koha/sites/$name/koha-conf.xml" -mysqlhost="$( xmlstarlet sel -t -v 'yazgfs/config/hostname' $kohaconfig )" || die "hostname missing from $kohaconfig" -mysqldb="$( xmlstarlet sel -t -v 'yazgfs/config/database' $kohaconfig )" || die "database missing from $kohaconfig" -mysqluser="$( xmlstarlet sel -t -v 'yazgfs/config/user' $kohaconfig )" || die "user missing from $kohaconfig" -mysqlpass="$( xmlstarlet sel -t -v 'yazgfs/config/pass' $kohaconfig )" || die "pass missing from $kohaconfig" +mysqlhost="$( xmlstarlet sel -t -v 'yazgfs/config/hostname' $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 )" -mysqltz="$( xmlstarlet sel -t -v 'yazgfs/config/timezone' $kohaconfig )" -if [ $? -eq 0 ] +mysqltz="$( xmlstarlet sel -t -v 'yazgfs/config/timezone' $kohaconfig || true )" +if [ "$mysqltz" != "" ] then - echo "Using time zone $mysqltz" - mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpass" --init-command="SET time_zone = '$mysqltz'" \ - "$mysqldb" "${@}" + mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpass" --init-command="SET time_zone='$mysqltz'" \ + "$mysqldb" "${@}" else - echo "No time zone set for Koha, using database time zone." - mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpass" \ - "$mysqldb" "${@}" + mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpass" \ + "$mysqldb" "${@}" fi - --