--- doc/install/linux/install.pl 2021/03/18 22:00:54 1.45.2.13 +++ doc/install/linux/install.pl 2021/03/28 22:00:27 1.45.2.14 @@ -76,7 +76,7 @@ if (!open(LOG,">>loncapa_install.log")) &mt('Stopping execution.')."\n"; exit; } else { - print LOG '$Id: install.pl,v 1.45.2.13 2021/03/18 22:00:54 raeburn Exp $'."\n"; + print LOG '$Id: install.pl,v 1.45.2.14 2021/03/28 22:00:27 raeburn Exp $'."\n"; } # @@ -469,7 +469,7 @@ sub check_required { } $mysqlon = &check_mysql_running($distro); if ($mysqlon) { - ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser,$mysql_unix_socket) = + ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser,$mysql_unix_socket) = &check_mysql_setup($instdir,$dsn,$distro); if ($mysqlsetup eq 'needsrestart') { $mysqlrestart = ''; @@ -1163,7 +1163,7 @@ sub check_mysql_setup { my $sth = $dbh->prepare("SELECT Priv FROM mysql.global_priv WHERE (User = 'root' AND Host ='localhost')"); $sth->execute(); while (my $priv = $sth->fetchrow_array) { - if ($priv =~ /unix_socket/) { + if ($priv =~ /unix_socket/) { $mysql_unix_socket = 1; last; } @@ -1195,7 +1195,7 @@ sub check_mysql_setup { $mysql_has_wwwuser = &check_mysql_wwwuser($dbh); return ($mysqlsetup,$has_pass,$dbh,$mysql_has_wwwuser,$mysql_unix_socket); } - } + } } elsif ($DBI::err =~ /1045/) { $has_pass = 1; } elsif ($distro =~ /^ubuntu(\d+)$/) { @@ -1855,7 +1855,7 @@ if ($callsub{'download'}) { print "\n".&mt('Requested configuration complete.')."\n\n"; if ($have_tarball && !$updateshown) { my ($lcdir) = ($sourcetarball =~ /^([\w.\-]+)\.tar.gz$/); - my ($apachename,$lc_uses_systemctl,$uses_sudo); + my ($apachename,$lc_uses_systemctl,$uses_sudo); if ($distro =~ /^(suse|sles|debian|ubuntu)([\d.]+)/) { if (($1 eq 'suse') && ($2 < 10)) { $apachename = 'apache';