From 862df3d8461a7a6455b606a7ee595334a93c59cf Mon Sep 17 00:00:00 2001 From: Magnus Enger Date: Mon, 15 Aug 2011 09:00:07 +0200 Subject: [PATCH] Bug 6540 - Followup - koha-create would die without --configfile koha-create would fail to check that --configfile was set on the commandline, before either including it if it existed or dying if it did not. This patch should make sure the existence of a configfile is only tested if --config is set. Signed-off-by: Robin Sheat This should apply against 3.4 and master. Signed-off-by: Chris Cormack (cherry picked from commit 31bb901e2b31748dd86e7da45672c42a5359c5a4) Signed-off-by: Chris Nighswonger --- debian/scripts/koha-create | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create index 2f17d5d2fb..018cae535a 100755 --- a/debian/scripts/koha-create +++ b/debian/scripts/koha-create @@ -112,11 +112,14 @@ while true ; do done # Load the configfile given on the command line -if [ -e "$configfile" ] +if [ "$configfile" != "" ] then - . "$configfile" -else - die "$configfile does not exist."; + if [ -e "$configfile" ] + then + . "$configfile" + else + die "$configfile does not exist."; + fi fi # Make sure options from the command line get the highest precedence -- 2.39.5