[Koha-cvs] CVS: koha/misc Install.pm,1.49,1.50

[MJ Ray]

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv7903

Modified Files:
	Install.pm 
Log Message:
my.cnf and grep bugsquashes from mailing list

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** Install.pm	5 Sep 2003 08:40:28 -0000	1.49
--- Install.pm	7 Sep 2003 22:51:46 -0000	1.50
***************
*** 119,122 ****
--- 119,123 ----
  my $mycnf = $ENV{HOME}."/.my.cnf";
  my $mytmpcnf = `mktemp my.cnf.koha.XXXXXX`;
+ chomp($mytmpcnf);
  
  my $messages;
***************
*** 1189,1193 ****
  
  	startsysout;
!     if (`grep 'VirtualHost $servername' "$httpdconf"`) {
  	showmessage(getmessage('ApacheAlreadyConfigured', [$httpdconf, $httpdconf]), 'PressEnter');
  	return;
--- 1190,1194 ----
  
  	startsysout;
!     if (`grep -q 'VirtualHost $servername' "$httpdconf"`) {
  	showmessage(getmessage('ApacheAlreadyConfigured', [$httpdconf, $httpdconf]), 'PressEnter');
  	return;