From 90bb062710aba00463cc9b4ecf97cf2776de187b Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 21 Oct 2015 13:02:31 +0200 Subject: [PATCH] Bug 14674: [QA Follow-up] Typos and textual adjustment This patch does: [1] Resolve error [koha-create: line 294: local: `=upload21': not a valid identifier] by replacing $instance by instance. [2] Resolved typo for 'specify'. [3] Resolve error: [sed: -e expression #26, char 20: unknown option to `s'] by replacing the slash in the sed line by a #. This makes sed not stumble over the slashes in the upload path. [4] Added the aspect of permanent storage in the wording (as opposed to the storage of temporary uploads in /tmp or similar). Signed-off-by: Marcel de Rooy Verified that koha-create now inserts the right path in koha-conf.xml. Verified that koha-create-dirs created the new uploads directory. Signed-off-by: Jonathan Druart --- debian/docs/koha-create.xml | 2 +- debian/scripts/koha-create | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/docs/koha-create.xml b/debian/docs/koha-create.xml index 129de9d..92785ac 100644 --- a/debian/docs/koha-create.xml +++ b/debian/docs/koha-create.xml @@ -171,7 +171,7 @@ - Specifiy a for storing the instance's uploaded files. + Specify a for storing the permanently uploaded files of the instance. It defaults to /var/lib/koha/instance/uploads. diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create index dd32e27..a36f7e3 100755 --- a/debian/scripts/koha-create +++ b/debian/scripts/koha-create @@ -109,7 +109,7 @@ generate_config_file() { -e "s/__DB_PASS__/$mysqlpwd/g" \ -e "s/__UNIXUSER__/$username/g" \ -e "s/__UNIXGROUP__/$username/g" \ - -e "s/__UPLOAD_PATH__/$UPLOAD_PATH/g" \ + -e "s#__UPLOAD_PATH__#$UPLOAD_PATH#g" \ -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \ -e "s/__MEMCACHED_NAMESPACE__/$MEMCACHED_NAMESPACE/g" \ -e "s/__MEMCACHED_SERVERS__/$MEMCACHED_SERVERS/g" \ @@ -291,7 +291,7 @@ set_memcached() set_upload_path() { - local $instance="$1" + local instance="$1" if [ "$CLO_UPLOAD_PATH" != "" ]; then UPLOAD_PATH=$CLO_UPLOAD_PATH -- 2.1.0