[LON-CAPA-cvs] cvs: doc(version_2_11_X) /install/linux install.pl
raeburn
raeburn at source.lon-capa.org
Thu Aug 1 08:57:23 EDT 2024
raeburn Thu Aug 1 12:57:23 2024 EDT
Modified files: (Branch: version_2_11_X)
/doc/install/linux install.pl
Log:
- For 2.11
Backport 1.94
-------------- next part --------------
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.45.2.21 doc/install/linux/install.pl:1.45.2.22
--- doc/install/linux/install.pl:1.45.2.21 Sun Jul 28 14:05:29 2024
+++ doc/install/linux/install.pl Thu Aug 1 12:57:23 2024
@@ -76,7 +76,7 @@
&mt('Stopping execution.')."\n";
exit;
} else {
- print LOG '$Id: install.pl,v 1.45.2.21 2024/07/28 14:05:29 raeburn Exp $'."\n";
+ print LOG '$Id: install.pl,v 1.45.2.22 2024/08/01 12:57:23 raeburn Exp $'."\n";
}
#
@@ -373,7 +373,7 @@
sub check_locale {
my ($distro) = @_;
- my ($fh,$langvar,$command,$earlyout);
+ my ($fh,$langvar,$command,$langcmd,$earlyout,$default);
$langvar = 'LANG';
if ($distro =~ /^(ubuntu|debian)/) {
if (!open($fh,"</etc/default/locale")) {
@@ -427,12 +427,13 @@
$earlyout = 1;
}
}
- return if ($earlyout);
+ return () if ($earlyout);
my @data = <$fh>;
chomp(@data);
+ close($fh);
foreach my $item (@data) {
if ($item =~ /^\Q$langvar\E=\"?([^\"]*)\"?/) {
- my $default = $1;
+ $default = $1;
if ($default ne 'en_US.UTF-8') {
if ($distro =~ /^debian/) {
$command = 'locale-gen en_US.UTF-8'."\n".
@@ -453,8 +454,72 @@
last;
}
}
- close($fh);
- return $command;
+# Check for locales
+ if ($default ne 'en_US.UTF-8') {
+ my ($has_us_english,$has_other_code,$has_other_lang);
+ if (open(PIPE,"locale -a 2>/dev/null |")) {
+ while (<PIPE>) {
+ chomp();
+ next if (/^(C(|\.utf8)|POSIX)$/i);
+ if (/^en_US\.utf8/i) {
+ $has_us_english = 1;
+ } elsif (/^[A-Za-z]{2}_[A-Za-z]{2}/) {
+ $has_other_code = 1;
+ } elsif (/^[A-Za-z]{3,}/) {
+ $has_other_lang = 1;
+ }
+ }
+ close(PIPE);
+ if (!$has_us_english) {
+ if ($has_other_code || $has_other_lang) {
+ if ($distro =~ /^ubuntu/) {
+ $langcmd = "sudo apt-get install language-pack-en\n";
+ } elsif ($distro =~ /^debian/) {
+ $langcmd = "apt-get install language-pack-en\n";
+ } elsif ($distro =~ /^(suse|sles)/) {
+ $langcmd = &mt('Use yast: System > Language > Primary Language = English')."\n";
+ } elsif ($distro =~ /^fedora(\d+)$/) {
+ if ($1 > 23) {
+ $langcmd = "dnf install glibc-langpack-en\n";
+ } else {
+ $langcmd = "yum install glibc-common\n";
+ }
+ } elsif ($distro =~ /^(?:rhes|centos|scientific|oracle|rocky|alma)(\d+)/) {
+ if ($1 > 7) {
+ $langcmd = "dnf install glibc-langpack-en\n";
+ } else {
+ $langcmd = "yum install glibc-common\n";
+ }
+ }
+ } else {
+ if ($distro =~ /^ubuntu/) {
+ $langcmd = "sudo apt-get install language-pack-en\n";
+ } elsif ($distro =~ /^debian/) {
+ $langcmd = "apt-get install language-pack-en\n";
+ } elsif ($distro =~ /^(suse|sles)/) {
+ $langcmd = &mt('Use yast: System > Language > Primary Language = English')."\n";
+ } elsif ($distro =~ /^fedora(\d+)$/) {
+ if ($1 > 23) {
+ $langcmd = &mt('Either install all languages[_1]or install English only[_2]',
+ ":\ndnf install glibc-all-langpacks\n\n",
+ ":\ndnf install glibc-langpack-en\n");
+ } else {
+ $langcmd = "yum install glibc-common\n";
+ }
+ } elsif ($distro =~ /^(?:rhes|centos|scientific|oracle|rocky|alma)(\d+)/) {
+ if ($1 > 7) {
+ $langcmd = &mt('Either install all languages[_1]or install English only[_2]',
+ ":\ndnf install glibc-all-langpacks\n\n",
+ ":\ndnf install glibc-langpack-en\n");
+ } else {
+ $langcmd = "yum install glibc-common\n";
+ }
+ }
+ }
+ }
+ }
+ }
+ return ($command,$langcmd);
}
sub check_required {
@@ -465,11 +530,11 @@
}
my $gotprereqs = &check_prerequisites($packagecmd,$distro);
if ($gotprereqs eq '') {
- return ($distro,$gotprereqs,'',$packagecmd,$updatecmd);
+ return ($distro,$gotprereqs,'','',$packagecmd,$updatecmd);
}
- my $localecmd = &check_locale($distro);
+ my ($localecmd,$langcmd) = &check_locale($distro);
unless ($localecmd eq '') {
- return ($distro,$gotprereqs,$localecmd);
+ return ($distro,$gotprereqs,$localecmd,$langcmd);
}
my ($mysqlon,$mysqlsetup,$mysqlrestart,$dbh,$has_pass,$mysql_unix_socket,$has_lcdb,
%recommended,$downloadstatus,$filetouse,$production,$testing,$apachefw,
@@ -492,7 +557,7 @@
$mysqlrestart = 'sudo ';
}
$mysqlrestart .= 'service mysql restart';
- return ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,$mysqlrestart);
+ return ($distro,$gotprereqs,$localecmd,$langcmd,$packagecmd,$updatecmd,$installnow,$mysqlrestart);
} else {
if ($mysqlsetup eq 'noroot') {
$recommended{'mysqlperms'} = 1;
@@ -518,7 +583,7 @@
$recommended{'stopsrvcs'} = &chksrvcs($distro,$tostop);
($recommended{'download'},$downloadstatus,$filetouse,$production,$testing)
= &need_download($distro,$instdir);
- return ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,
+ return ($distro,$gotprereqs,$localecmd,$langcmd,$packagecmd,$updatecmd,$installnow,
$mysqlrestart,\%recommended,$dbh,$has_pass,$mysql_unix_socket,
$has_lcdb,$downloadstatus,$filetouse,$production,$testing,$apachefw,
$uses_systemctl);
@@ -1608,7 +1673,7 @@
print "\n".&mt('Checking system status ...')."\n";
my $dsn = "DBI:mysql:database=mysql";
-my ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,$mysqlrestart,
+my ($distro,$gotprereqs,$localecmd,$langcmd,$packagecmd,$updatecmd,$installnow,$mysqlrestart,
$recommended,$dbh,$has_pass,$mysql_unix_socket,$has_lcdb,$downloadstatus,
$filetouse,$production,$testing,$apachefw,$uses_systemctl) = &check_required($instdir,$dsn);
if ($distro eq '') {
@@ -1627,8 +1692,12 @@
exit;
}
if ($localecmd ne '') {
- print "\n".&mt('Although the LON-CAPA application itself is localized for a number of different languages, the default locale language for the Linux OS on which it runs should be US English.')."\n";
- print "\n".&mt('Run the following command from the command line to set the default language for your OS, and then run this LON-CAPA installation set-up script again.')."\n\n".
+ print "\n".&mt('Although the LON-CAPA application itself is localized for a number of different languages,[_1]the default locale language for the Linux OS on which it runs should be US English.',"\n")."\n\n";
+ if ($langcmd ne '') {
+ print &mt('Use the following command(s) or action(s) to install a required language package.')."\n\n".
+ "$langcmd\n";
+ }
+ print &mt('Run the following command from the command line to set the default language for your OS,[_1]and then run this LON-CAPA installation set-up script again.',"\n")."\n\n".
$localecmd."\n\n".
&mt('Stopping execution.')."\n";
exit;
@@ -1652,7 +1721,7 @@
&mt('Stopping execution.')."\n";
exit;
} else {
- ($distro,$gotprereqs,$localecmd,$packagecmd,$updatecmd,$installnow,
+ ($distro,$gotprereqs,$localecmd,$langcmd,$packagecmd,$updatecmd,$installnow,
$mysqlrestart,$recommended,$dbh,$has_pass,$mysql_unix_socket,
$has_lcdb,$downloadstatus,$filetouse,$production,$testing,$apachefw,
$uses_systemctl) = &check_required($instdir,$dsn);
More information about the LON-CAPA-cvs
mailing list