--- doc/install/linux/install.pl 2020/05/01 18:29:56 1.64 +++ doc/install/linux/install.pl 2020/05/03 00:33:56 1.66 @@ -77,7 +77,7 @@ if (!open(LOG,">>loncapa_install.log")) &mt('Stopping execution.')."\n"; exit; } else { - print LOG '$Id: install.pl,v 1.64 2020/05/01 18:29:56 raeburn Exp $'."\n"; + print LOG '$Id: install.pl,v 1.66 2020/05/03 00:33:56 raeburn Exp $'."\n"; } # @@ -454,6 +454,7 @@ sub check_locale { } elsif (!open($fh,"= 7) { @@ -2582,7 +2583,7 @@ sub get_mysql_version { my $info = ; chomp($info); close(PIPE); - ($version,$subversion,$name) = ($info =~ /(\d+\.\d+)\.(\d+)\-?(\w*),/); + ($version,$subversion,$name) = ($info =~ /(\d+\.\d+)\.(\d+)(?:\-?(\w*),|)/); } else { print &mt('Could not determine which version of MySQL is installed.'). "\n"; @@ -3217,7 +3218,7 @@ sub copy_apache2_debconf { unless ($diffres) { $skipsite = 1; } - } + } } } }