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

[raeburn]

raeburn		Thu Nov 13 22:08:41 2025 EDT

  Modified files:              
    /doc/install/linux	install.pl 
  Log:
  - Support SLES16
  
  
Index: doc/install/linux/install.pl
diff -u doc/install/linux/install.pl:1.99 doc/install/linux/install.pl:1.100
--- doc/install/linux/install.pl:1.99	Thu Oct 30 21:42:43 2025
+++ doc/install/linux/install.pl	Thu Nov 13 22:08:41 2025
@@ -78,7 +78,7 @@
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.99 2025/10/30 21:42:43 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.100 2025/11/13 22:08:41 raeburn Exp $'."\n";
 }
 
 #
@@ -505,7 +505,8 @@
                 } elsif ($distro =~ /^ubuntu/) {
                     $command = 'sudo locale-gen en_US.UTF-8'."\n".
                                'sudo update-locale LANG=en_US.UTF-8';
-                } elsif ($distro =~ /^(suse|sles)/) {
+                } elsif (($distro =~ /^(suse|sles)(\d+)/) &&
+                         (!(($1 eq 'sles') && ($2 >= 16)))) {
                     $command = 'yast language';
                 } elsif (-e '/usr/bin/system-config-language') {
                     $command = 'system-config-language';
@@ -540,8 +541,12 @@
                         $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 =~ /^(suse|sles)(\d+)/) {
+                        if (($1 eq 'sles') && ($2 >= 16)) {
+                            $langcmd = "zypper addlocale en_US\n";
+                        } else {
+                            $langcmd = &mt('Use yast: System > Language > Primary Language = English')."\n";
+                        }
                     } elsif ($distro =~ /^fedora(\d+)$/) {
                         if ($1 > 23) {
                             $langcmd = "dnf install glibc-langpack-en\n";
@@ -560,8 +565,12 @@
                         $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 =~ /^(suse|sles)(\d+)/) {
+                        if (($1 eq 'sles') && ($2 >= 16)) {
+                            $langcmd = "zypper addlocale en_US\n";
+                        } else {
+                            $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]',
@@ -1684,7 +1693,7 @@
     my ($instdir,$dsn,$distro) = @_;
     my ($mysqlsetup,$has_pass,$mysql_unix_socket,$mysql_has_wwwuser);
     my $dbh = DBI->connect($dsn,'root','',{'PrintError'=>0});
-    my ($mysqlversion,$mysqlminorversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
+    my ($mysqlversion,$mysqlminorversion,$mysqlsubver,$mysqlname) = &get_mysql_version($distro);
     if (($mysqlname =~ /^MariaDB/i) && (($mysqlversion == 10 && $mysqlminorversion >= 4) || ($mysqlversion >= 11))) {
         if ($dbh) {
             my $sth = $dbh->prepare("SELECT Priv FROM mysql.global_priv WHERE (User = 'root' AND Host ='localhost')");
@@ -2245,7 +2254,7 @@
     &print_and_log(&mt('Skipping configuration of MySQL.')."\n");
     if ($callsub{'mysqlperms'}) {
         if ($dbh) {
-            &setup_mysql_permissions($dbh,$has_pass,$mysql_unix_socket);
+            &setup_mysql_permissions($dbh,$has_pass,$mysql_unix_socket,$distro);
         } else {
             print &mt('Unable to configure MySQL because access is denied.')."\n";  
         }
@@ -2808,7 +2817,7 @@
 CREATE TABLE IF NOT EXISTS metadata (title TEXT, author TEXT, subject TEXT, url TEXT, keywords TEXT, version TEXT, notes TEXT, abstract TEXT, mime TEXT, language TEXT, creationdate DATETIME, lastrevisiondate DATETIME, owner TEXT, copyright TEXT, domain TEXT, dependencies TEXT, modifyinguser TEXT, authorspace TEXT, lowestgradelevel TEXT, highestgradelevel TEXT, standards TEXT, count INT, course INT, course_list TEXT, goto INT, goto_list TEXT, comefrom INT, comefrom_list TEXT, sequsage INT, sequsage_list TEXT, stdno INT, stdno_list TEXT, avetries FLOAT, avetries_list TEXT, difficulty FLOAT, difficulty_list TEXT, disc FLOAT, disc_list TEXT, clear FLOAT, technical FLOAT, correct FLOAT, helpful FLOAT, depth FLOAT, hostname TEXT, FULLTEXT idx_title (title), FULLTEXT idx_author (author), FULLTEXT idx_subject (subject), FULLTEXT idx_url (url), FULLTEXT idx_keywords (keywords), FULLTEXT idx_version (version), FULLTEXT idx_notes (notes), FULLTEXT idx_abstract (abstract), FULLTEXT idx_mime (mi
 me), FULLTEXT idx_language (language), FULLTEXT idx_owner (owner), FULLTEXT idx_copyright (copyright)) ENGINE=MYISAM
 });
     if ($setup_mysql_permissions) {
-        &setup_mysql_permissions($dbh,$has_pass,$mysql_unix_socket, at mysql_lc_commands);
+        &setup_mysql_permissions($dbh,$has_pass,$mysql_unix_socket,$distro, at mysql_lc_commands);
     } else {
         print_and_log(&mt('Skipping MySQL permissions setup.')."\n");
         if ($dbh) {
@@ -2825,8 +2834,8 @@
 }
 
 sub setup_mysql_permissions {
-    my ($dbh,$has_pass,$mysql_unix_socket, at mysql_lc_commands) = @_;
-    my ($mysqlversion,$mysqlminorversion,$mysqlsubver,$mysqlname) = &get_mysql_version();
+    my ($dbh,$has_pass,$mysql_unix_socket,$distro, at mysql_lc_commands) = @_;
+    my ($mysqlversion,$mysqlminorversion,$mysqlsubver,$mysqlname) = &get_mysql_version($distro);
     my ($usescreate,$usesauth,$is_mariadb,$hasauthcol, at mysql_commands);
     if ($mysqlname =~ /^MariaDB/i) {
         $is_mariadb = 1;
@@ -2956,8 +2965,15 @@
 }
 
 sub get_mysql_version {
+    my ($distro) = @_;    
     my ($version,$minorversion,$subversion,$name);
-    if (open(PIPE," mysql -V |")) {
+    my $command = 'mysql';
+    if ($distro =~ /^sles(\d+)/) { 
+        if ($1 >= 16) {
+            $command = '/usr/bin/mariadb';
+        }
+    }
+    if (open(PIPE," $command -V |")) {
         my $info = <PIPE>;
         chomp($info);
         close(PIPE);