From 2f3e453430dd3a09d131bfca2cc2037fa11f816e Mon Sep 17 00:00:00 2001 From: Magnus Enger Date: Thu, 30 Jun 2011 08:47:35 +0200 Subject: [PATCH] Bug 6517 - [REVISED] koha-create wants "use database" in DEFAULTSQL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The revised patch quotes the variable $mysqldb, as suggested by Frère Sébastien Marie. This patch makes sure that pointing DEFAULTSQL in /etc/koha/koha-sites.conf to any (gzip'ed) file produced by mysqldump works, by adding the name of the database to the end of the call to mysql, when the specified SQL file is loaded. Files produced with koha-dump-defaults should still work too. To test: - Apply the patch - Create a new package with build-git-snapshot - Install the package - Create an SQL file from an existing installation with mysqldump - gzip the SQL file - point DEFAULTSQL to the file in /etc/koha/koha-sites.conf - create a new site with koha-create --create-db --- debian/scripts/koha-create | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create index e3c73fc..5ac5430 100755 --- a/debian/scripts/koha-create +++ b/debian/scripts/koha-create @@ -189,7 +189,7 @@ then # Populate the database with default content. zcat "$DEFAULTSQL" | sed "s/__KOHASITE__/$name/g" | - mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpwd" + mysql --host="$mysqlhost" --user="$mysqluser" --password="$mysqlpwd" "$mysqldb" # Change the default user's password. -- 1.7.4.1