doc/install/linux/install.pl - diff

Return to install.pl CVS log

Up to [LON-CAPA] / doc / install / linux

version 1.64, 2020/05/01 18:29:56	version 1.66, 2020/05/03 00:33:56
Line 454 sub check_locale {	Line 454 sub check_locale {
} elsif (!open($fh,"</etc/sysconfig/i18n")) {	} elsif (!open($fh,"</etc/sysconfig/i18n")) {
print &mt('Failed to open: [_1], default locale not checked.',	print &mt('Failed to open: [_1], default locale not checked.',
'/etc/sysconfig/i18n');	'/etc/sysconfig/i18n');
	$earlyout = 1;
}	}
} elsif ($distro =~ /^(?:rhes\|centos\|scientific\|oracle)(\d+)/) {	} elsif ($distro =~ /^(?:rhes\|centos\|scientific\|oracle)(\d+)/) {
if ($1 >= 7) {	if ($1 >= 7) {
Line 2582 sub get_mysql_version {	Line 2583 sub get_mysql_version {
my $info = <PIPE>;	my $info = <PIPE>;
chomp($info);	chomp($info);
close(PIPE);	close(PIPE);
($version,$subversion,$name) = ($info =~ /(\d+\.\d+)\.(\d+)\-?(\w*),/);	($version,$subversion,$name) = ($info =~ /(\d+\.\d+)\.(\d+)(?:\-?(\w*),\|)/);
} else {	} else {
print &mt('Could not determine which version of MySQL is installed.').	print &mt('Could not determine which version of MySQL is installed.').
"\n";	"\n";
Line 3217 sub copy_apache2_debconf {	Line 3218 sub copy_apache2_debconf {
unless ($diffres) {	unless ($diffres) {
$skipsite = 1;	$skipsite = 1;
}	}
}	}
}	}
}	}
}	}