[LON-CAPA-cvs] cvs: doc /install/linux install.pl

[raeburn]

raeburn		Fri May  1 19:02:51 2020 EDT

  Modified files:              
    /doc/install/linux	install.pl 
  Log:
  - Support detection of MySQL version for Ubuntu 20 LTS.
  
  
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.64 doc/install/linux/install.pl:1.65
--- doc/install/linux/install.pl:1.64	Fri May  1 18:29:56 2020
+++ doc/install/linux/install.pl	Fri May  1 19:02:51 2020
@@ -77,7 +77,7 @@
           &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.65 2020/05/01 19:02:51 raeburn Exp $'."\n";
 }
 
 #
@@ -2582,7 +2582,7 @@
         my $info = <PIPE>;
         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 +3217,7 @@
                         unless ($diffres) {
                             $skipsite = 1;
                         }
-                    } 
+                    }
                 }
             }
         }