[LON-CAPA-cvs] cvs: doc /loncapafiles updatequery.piml

[raeburn]

raeburn		Mon Sep 14 18:04:02 2026 EDT

  Modified files:              
    /doc/loncapafiles	updatequery.piml 
  Log:
  - Reverse changes in rev. 1.108
  - If "Accessibility Checking Available" set to 'Y' during configuration:
    Fedora 40 and newer use node.js v24. Update /usr/bin/node and /usr/bin/npm
    (both symlinks) for these distros to point at node.js v24 binary, and 
    npm-cli.js file for node.js v24 respectively.
  
  
Index: doc/loncapafiles/updatequery.piml
diff -u doc/loncapafiles/updatequery.piml:1.108 doc/loncapafiles/updatequery.piml:1.109
--- doc/loncapafiles/updatequery.piml:1.108	Sun Sep 13 20:39:44 2026
+++ doc/loncapafiles/updatequery.piml	Mon Sep 14 18:04:02 2026
@@ -1,6 +1,6 @@
 <!-- updatequery.piml -->
 
-<!-- $Id: updatequery.piml,v 1.108 2026/09/13 20:39:44 raeburn Exp $ -->
+<!-- $Id: updatequery.piml,v 1.109 2026/09/14 18:04:02 raeburn Exp $ -->
 
 <!--
 
@@ -777,8 +777,8 @@
     } elsif ($dist eq 'fedora') {
         if ($version > 39) {
             $browser = '/usr/bin/chromium-browser';
-            unless (($nodejs) && ($nodemajor >= 20)) {
-                $installref->{'nodejs'} = 1;
+            unless (($nodejs) && ($nodemajor >= 24)) {
+                $installref->{'nodejs24'} = 1;
             }
         }
     }
@@ -2833,6 +2833,32 @@
                             close($pipe);
                         }
                     }
+                    if ($dist eq 'fedora') {
+                        my $nodejsbin = '/usr/bin/node';
+                        my $npmbin = '/usr/bin/npm';
+                        my $nodejs24 = can_run('node-24');
+                        if ($nodejs24) {
+                            $nodejs24 = Cwd::realpath($nodejs24);
+                        }
+                        if ($nodejs24 eq '/usr/bin/node-24') {
+                            if (-l $nodejsbin) {
+                                unless (readlink($nodejsbin) =~ /\Qnode-24\E$/) {
+                                    unlink($nodejsbin);
+                                    symlink('node-24', $nodejsbin);
+                                }
+                            } elsif (!-f $nodejsbin) { 
+                                symlink('node-24', $nodejsbin);
+                            }
+                            if (-l $npmbin) {
+                                unless (readlink($npmbin) =~ /\Qnode_modules_24\E/) {
+                                    unlink($npmbin);
+                                    symlink('../lib/node_modules_24/npm/bin/npm-cli.js', $npmbin);
+                                }
+                            } elsif (!-f $npmbin) {
+                                symlink('../lib/node_modules_24/npm/bin/npm-cli.js', $npmbin); 
+                            }
+                        }
+                    }
                 }
             }
         }