[Koha-cvs] CVS: koha/misc Install.pm,1.70,1.71

[Ambrose Li]

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4855/misc

Modified Files:
	Install.pm 
Log Message:
Fix of bug 711, "No message named WhereisMySQL in Install.pm".

Added defined() check for
"Use of uninitialized value in -e at Install.pm line 2085, <STDIN> line 32."


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -r1.70 -r1.71
*** Install.pm	22 Dec 2003 19:16:58 -0000	1.70
--- Install.pm	9 Feb 2004 22:36:32 -0000	1.71
***************
*** 998,1002 ****
      if (!$mysqldir){
  	for (;;) {
! 	    $mysqldir = showmessage(getmessage('WhereisMySQL'),'free');
  	    last if -f "$mysqldir/bin/mysqladmin";
  	}
--- 998,1002 ----
      if (!$mysqldir){
  	for (;;) {
! 	    $mysqldir = showmessage(getmessage('WhereIsMySQL'),'free');
  	    last if -f "$mysqldir/bin/mysqladmin";
  	}
***************
*** 2080,2087 ****
  
  sub restoremycnf {
! 	if (-e $mycnf) {
  		unlink($mycnf);
  	}
! 	if (-e $mytmpcnf) {
  		rename $mytmpcnf,$mycnf;
  	}
--- 2080,2087 ----
  
  sub restoremycnf {
! 	if (defined $mycnf && -e $mycnf) {
  		unlink($mycnf);
  	}
! 	if (defined $mytmpcnf && -e $mytmpcnf) {
  		rename $mytmpcnf,$mycnf;
  	}