Fix source-sh/sh-to-mod shell translation for Fish 4.0

Signed-off-by: Xavier Delaruelle <[email protected]>

Author: xdelaruelle

NEWS.rst

@@ -36,6 +36,8 @@ Modules 5.6.0 (not yet released)
 * Doc: add :ref:`add-new-maintainer` guide
 * Fix interpreter variable reset between multiple modulefile or modulerc
   evaluations when variable initial value is an invalid list. (fix issue #570)
+* Fix :mfcmd:`source-sh` and :subcmd:`sh-to-mod` shell translation when used
+  with new *fish* shell version (4.0).
 
 .. _Security policy: https://github.com/envmodules/modules/blob/main/SECURITY.md
 .. _Modules chat room: https://matrix.to/#/#modules:matrix.org

tcl/mfcmd.tcl

@@ -1486,7 +1486,7 @@ proc execShAndGetEnv {elt_ignored_list shell script args} {
             shell $shdesc] 2>&1; or exit \$status; echo '$sep'; set -xgL;\
             echo '$sep'; $getfunc; string split \$funcout; echo '$sep';\
             string split \$funcout; echo '$sep'; complete; echo '$sep'; pwd"
-         set varre {^(\S+?\M) ?'?(.*?)'?$}
+         set varre {^(\S+?\M) ?['"]?(.*?)['"]?$}
          # exclude alias from function list
          set funcre "^function (\\S+?)(?: \[^\\n\]*?--description\
             (?!'?alias)\[^\\n\]+)?\\n(.+?)?\\s*\\nend\\n$subsep\$"

testsuite/modules.00-init/005-init_ts.exp

@@ -102,6 +102,7 @@ if {[set fishbin [lindex [auto_execok fish] 0]] ne {}} {
    regexp {version (.+)$} [exec $fishbin --version] match fish_version
    set fish_version_ge31 [expr {[lindex [lsort -dictionary [list $fish_version 3.1.0]] 0] eq {3.1.0}}]
    set fish_version_ge32 [expr {[lindex [lsort -dictionary [list $fish_version 3.2.0]] 0] eq {3.2.0}}]
+   set fish_version_ge40 [expr {[lindex [lsort -dictionary [list $fish_version 4.0.0]] 0] eq {4.0.0}}]
 }
 
 # find ksh flavor

testsuite/modules.70-maint/310-sh-to-mod.exp

@@ -226,9 +226,15 @@ set tscomp_tcsh "complete\ttcsh cmd {'n/-h/n/' 'n/--help/n/' 'n/-V/n/' 'n/--vers
 complete\ttcsh mycmd {'n/help/`_module_avail`/' 'n/add/`_module_not_yet_loaded; echo \"--auto --no-auto --force -f --icase -i --tag --tag=\"`/'}
 complete\ttcsh othercmd 'n/--help/n/'"
 if {[info exists fish_version_ge31] && $fish_version_ge31} {
+    if {[info exists fish_version_ge40] && $fish_version_ge40} {
+set tscomp_alias_fish "complete\tfish alcb --wraps\\ 'echo\\ f\\\\\\\\\\\{o'
+complete\tfish alfoo {--wraps 'echo (grep \"report .Modules \" ../../modulecmd.tcl | tr -d \\\\\\\\ 2>/dev/null | awk \\'{print \$3}\\')'}
+complete\tfish alsp {--wraps 'echo f\\\\\"o; echo b\\\\\\\\\\\\\"r; echo f\\\\\\'o'}"
+    } else {
 set tscomp_alias_fish "complete\tfish alcb {--wraps echo\\ f\\\\\\\{o}
 complete\tfish alfoo {--wraps echo\\ \\(grep\\ \\\"report\\ .Modules\\ \\\"\\ ../../modulecmd.tcl\\ \\|\\ tr\\ -d\\ \\\\\\\\\\ 2\\>/dev/null\\ \\|\\ awk\\ \\'\\{print\\ \\\$3\\}\\'\\)}
 complete\tfish alsp {--wraps echo\\ f\\\\\\\"o\\;\\ echo\\ b\\\\\\\\\\\\\\\"r\\;\\ echo\\ f\\\\\\'o}"
+    }
 set tscomp_fish "complete\tfish cmd {-l help -d 'Command help'}
 complete\tfish cmd {-l version -d 'Command version'}
 complete\tfish cmd {-s h -d 'Command help'}