From 4c1fb55c4c64765cce6057a7b262d044cfa504f1 Mon Sep 17 00:00:00 2001 From: slef Date: Sun, 7 Sep 2003 22:51:46 +0000 Subject: [PATCH] my.cnf and grep bugsquashes from mailing list --- misc/Install.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/misc/Install.pm b/misc/Install.pm index add939d9e5..ffa78be0bf 100644 --- a/misc/Install.pm +++ b/misc/Install.pm @@ -118,6 +118,7 @@ sub heading ($) { my $mycnf = $ENV{HOME}."/.my.cnf"; my $mytmpcnf = `mktemp my.cnf.koha.XXXXXX`; +chomp($mytmpcnf); my $messages; $messages->{'continuing'}->{en}="Great! Continuing setup.\n\n"; @@ -1188,7 +1189,7 @@ sub updateapacheconf { } startsysout; - if (`grep 'VirtualHost $servername' "$httpdconf"`) { + if (`grep -q 'VirtualHost $servername' "$httpdconf"`) { showmessage(getmessage('ApacheAlreadyConfigured', [$httpdconf, $httpdconf]), 'PressEnter'); return; } else { -- 2.39.5