--- doc/install/linux/install.pl	2020/05/01 18:29:56	1.64
+++ doc/install/linux/install.pl	2020/07/08 17:19:10	1.67
@@ -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.67 2020/07/08 17:19:10 raeburn Exp $'."\n";
 }
 
 #
@@ -454,6 +454,7 @@ sub check_locale {
         } elsif (!open($fh,"</etc/sysconfig/i18n")) {
             print &mt('Failed to open: [_1], default locale not checked.',
                       '/etc/sysconfig/i18n');
+            $earlyout = 1;
         }
     } elsif ($distro =~ /^(?:rhes|centos|scientific|oracle)(\d+)/) {
         if ($1 >= 7) {
@@ -2582,7 +2583,7 @@ sub get_mysql_version {
         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";
@@ -3176,7 +3177,7 @@ sub copy_apache2_debconf {
         my $apache2_conf_available_dir = '/etc/apache2/conf-available';
         my $defaultconf = $apache2_conf_enabled_dir.'/loncapa.conf';
         if ((-e "$apache2_conf_available_dir/loncapa") && (-e "$instdir/debian-ubuntu/ubuntu14/loncapa_conf")) {
-            if (open(PIPE, "diff --brief $apache2_conf_available_dir/loncapa $instdir/debian-ubuntu/ubuntu14/loncapa_conf" |")) {
+            if (open(PIPE, "diff --brief $apache2_conf_available_dir/loncapa $instdir/debian-ubuntu/ubuntu14/loncapa_conf |")) {
                 my $diffres = <PIPE>;
                 close(PIPE);
                 chomp($diffres);
@@ -3217,7 +3218,7 @@ sub copy_apache2_debconf {
                         unless ($diffres) {
                             $skipsite = 1;
                         }
-                    } 
+                    }
                 }
             }
         }