Skip to content

Commit 3263787

Browse files
committed
install/doc: desc. provided-alias addition to {avail,spider}_output
Signed-off-by: Xavier Delaruelle <[email protected]>
1 parent 068b59a commit 3263787

File tree

5 files changed

+69
-54
lines changed

5 files changed

+69
-54
lines changed

INSTALL.rst

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -943,10 +943,10 @@ instance :instopt:`--without-modulepath<--with-modulepath>`):
943943

944944
Specify the content to report on avail sub-command regular output in addition
945945
to the available module names. Elements accepted in LIST are: ``modulepath``,
946-
``alias``, ``dirwsym``, ``indesym``, ``sym``, ``tag``, ``key``, ``hidden``,
947-
``variant``, ``variantifspec`` and ``via`` (elements in LIST are separated by
948-
``:``). The order of the elements in LIST does not matter.
949-
(default=\ ``modulepath:alias:dirwsym:sym:tag:variantifspec:key``)
946+
``alias``, ``provided-alias``, ``dirwsym``, ``indesym``, ``sym``, ``tag``,
947+
``key``, ``hidden``, ``variant``, ``variantifspec`` and ``via`` (elements in
948+
LIST are separated by ``:``). The order of the elements in LIST does not
949+
matter. (default=\ ``modulepath:alias:dirwsym:sym:tag:variantifspec:key``)
950950

951951
This installation option defines the default value of the
952952
:mconfig:`avail_output` configuration option which could be changed after
@@ -966,15 +966,16 @@ instance :instopt:`--without-modulepath<--with-modulepath>`):
966966
Element ``indesym`` added
967967

968968
.. versionchanged:: 5.6
969-
Elements ``hidden`` and ``via`` added
969+
Elements ``hidden``, ``provided-alias`` and ``via`` added
970970

971971
.. instopt:: --with-avail-terse-output=LIST
972972

973973
Specify the content to report on avail sub-command terse output in addition
974974
addition to the available module names. Elements accepted in LIST are:
975-
``modulepath``, ``alias``, ``dirwsym``, ``indesym``, ``sym``, ``tag``,
976-
``key``, ``hidden``, ``variant`` and ``variantifspec`` (elements in LIST are
977-
separated by ``:``). The order of the elements in LIST does not matter.
975+
``modulepath``, ``alias``, ``provided-alias``, ``dirwsym``, ``indesym``,
976+
``sym``, ``tag``, ``key``, ``hidden``, ``variant`` and ``variantifspec``
977+
(elements in LIST are separated by ``:``). The order of the elements in LIST
978+
does not matter.
978979
(default=\ ``modulepath:alias:dirwsym:sym:tag:variantifspec``)
979980

980981
This installation option defines the default value of the
@@ -995,7 +996,7 @@ instance :instopt:`--without-modulepath<--with-modulepath>`):
995996
Element ``indesym`` added
996997

997998
.. versionchanged:: 5.6
998-
Element ``hidden`` added
999+
Elements ``hidden`` and ``provided-alias`` added
9991000

10001001
.. instopt:: --with-bashcompletiondir=DIR
10011002

@@ -1398,10 +1399,10 @@ instance :instopt:`--without-modulepath<--with-modulepath>`):
13981399

13991400
Specify the content to report on spider sub-command regular output in
14001401
addition to the available module names. Elements accepted in LIST are:
1401-
``modulepath``, ``alias``, ``dirwsym``, ``indesym``, ``sym``, ``tag``,
1402-
``key``, ``hidden``, ``variant``, ``variantifspec`` and ``via`` (elements in
1403-
LIST are separated by ``:``). The order of the elements in LIST does not
1404-
matter.
1402+
``modulepath``, ``alias``, ``provided-alias``, ``dirwsym``, ``indesym``,
1403+
``sym``, ``tag``, ``key``, ``hidden``, ``variant``, ``variantifspec`` and
1404+
``via`` (elements in LIST are separated by ``:``). The order of the elements
1405+
in LIST does not matter.
14051406
(default=\ ``modulepath:alias:dirwsym:sym:tag:variantifspec:via:key``)
14061407

14071408
This installation option defines the default value of the
@@ -1416,9 +1417,10 @@ instance :instopt:`--without-modulepath<--with-modulepath>`):
14161417

14171418
Specify the content to report on spider sub-command terse output in addition
14181419
addition to the available module names. Elements accepted in LIST are:
1419-
``modulepath``, ``alias``, ``dirwsym``, ``indesym``, ``sym``, ``tag``,
1420-
``key``, ``hidden``, ``variant`` and ``variantifspec`` (elements in LIST are
1421-
separated by ``:``). The order of the elements in LIST does not matter.
1420+
``modulepath``, ``alias``, ``provided-alias``, ``dirwsym``, ``indesym``,
1421+
``sym``, ``tag``, ``key``, ``hidden``, ``variant`` and ``variantifspec``
1422+
(elements in LIST are separated by ``:``). The order of the elements in LIST
1423+
does not matter.
14221424
(default=\ ``modulepath:alias:dirwsym:sym:tag:variantifspec``)
14231425

14241426
This installation option defines the default value of the

configure

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -432,17 +432,19 @@ Optional Packages:
432432
--with-avail-output=LIST
433433
specify content to report on avail sub-command
434434
regular output. elements accepted in LIST are:
435-
\`modulepath', \`alias', \`dirwsym', \`indesym',
436-
\`sym', \`tag', \`key', \`hidden', \`variant',
437-
\`variantifspec' and \`via' (elements in LIST are
438-
separated by \`:') [$availoutput]
435+
\`modulepath', \`alias', \`provided-alias',
436+
\`dirwsym', \`indesym', \`sym', \`tag', \`key',
437+
\`hidden', \`variant', \`variantifspec' and \`via'
438+
(elements in LIST are separated by \`:')
439+
[$availoutput]
439440
--with-avail-terse-output=LIST
440441
specify content to report on avail sub-command
441442
terse output. elements accepted in LIST are:
442-
\`modulepath', \`alias', \`dirwsym', \`indesym',
443-
\`sym', \`tag', \`key', \`hidden', \`variant' and
444-
\`variantifspec' (elements in LIST are separated by
445-
\`:') [$availterseoutput]
443+
\`modulepath', \`alias', \`provided-alias',
444+
\`dirwsym', \`indesym', \`sym', \`tag', \`key',
445+
\`hidden', \`variant' and \`variantifspec' (elements
446+
in LIST are separated by \`:')
447+
[$availterseoutput]
446448
--with-list-output=LIST
447449
specify content to report on list sub-command
448450
regular output. elements accepted in LIST are:
@@ -458,17 +460,19 @@ Optional Packages:
458460
--with-spider-output=LIST
459461
specify content to report on spider sub-command
460462
regular output. elements accepted in LIST are:
461-
\`modulepath', \`alias', \`dirwsym', \`indesym',
462-
\`sym', \`tag', \`key', \`hidden', \`variant',
463-
\`variantifspec' and \`via' (elements in LIST are
464-
separated by \`:') [$spideroutput]
463+
\`modulepath', \`alias', \`provided-alias',
464+
\`dirwsym', \`indesym', \`sym', \`tag', \`key',
465+
\`hidden', \`variant', \`variantifspec' and \`via'
466+
(elements in LIST are separated by \`:')
467+
[$spideroutput]
465468
--with-spider-terse-output=LIST
466469
specify content to report on spider sub-command
467470
terse output. elements accepted in LIST are:
468-
\`modulepath', \`alias', \`dirwsym', \`indesym',
469-
\`sym', \`tag', \`key', \`hidden', \`variant' and
470-
\`variantifspec' (elements in LIST are separated by
471-
\`:') [$spiderterseoutput]
471+
\`modulepath', \`alias', \`provided-alias',
472+
\`dirwsym', \`indesym', \`sym', \`tag', \`key',
473+
\`hidden', \`variant' and \`variantifspec' (elements
474+
in LIST are separated by \`:')
475+
[$spiderterseoutput]
472476
--with-variant-shortcut=SHORTCUTLIST
473477
define shortcut characters to specify variant names.
474478
Each element in SHORTCUTLIST is a variant name
@@ -879,10 +883,10 @@ for arg in "$@"; do
879883
allowedval=" load ml mod-to-sh purge reload switch switch_unload try-load unload " ;
880884
check_and_get_package_value_list "abortonerror" "$arg" "$allowedval" "" ;;
881885
--with-avail-output=*|--without-avail-output)
882-
allowedval=" modulepath alias dirwsym indesym sym tag key hidden variant variantifspec via " ;
886+
allowedval=" modulepath alias provided-alias dirwsym indesym sym tag key hidden variant variantifspec via " ;
883887
check_and_get_package_value_list "availoutput" "$arg" "$allowedval" "" ;;
884888
--with-avail-terse-output=*|--without-avail-terse-output)
885-
allowedval=" modulepath alias dirwsym indesym sym tag key hidden variant variantifspec " ;
889+
allowedval=" modulepath alias provided-alias dirwsym indesym sym tag key hidden variant variantifspec " ;
886890
check_and_get_package_value_list "availterseoutput" "$arg" "$allowedval" "" ;;
887891
--with-list-output=*|--without-list-output)
888892
allowedval=" header idx variant alias indesym sym tag hidden key " ;
@@ -891,10 +895,10 @@ for arg in "$@"; do
891895
allowedval=" header idx variant alias indesym sym tag hidden key " ;
892896
check_and_get_package_value_list "listterseoutput" "$arg" "$allowedval" "" ;;
893897
--with-spider-output=*|--without-spider-output)
894-
allowedval=" modulepath alias dirwsym indesym sym tag key hidden variant variantifspec via " ;
898+
allowedval=" modulepath alias provided-alias dirwsym indesym sym tag key hidden variant variantifspec via " ;
895899
check_and_get_package_value_list "spideroutput" "$arg" "$allowedval" "" ;;
896900
--with-spider-terse-output=*|--without-spider-terse-output)
897-
allowedval=" modulepath alias dirwsym indesym sym tag key hidden variant variantifspec " ;
901+
allowedval=" modulepath alias provided-alias dirwsym indesym sym tag key hidden variant variantifspec " ;
898902
check_and_get_package_value_list "spiderterseoutput" "$arg" "$allowedval" "" ;;
899903
--with-variant-shortcut=*|--without-variant-shortcut)
900904
variantshortcut=$(get_package_value "$arg" "") ;;

doc/source/changes.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,8 +1323,9 @@ The following Modules configuration option has been introduced on Modules 5.
13231323
Starting version 5.3.1, element ``indesym`` is added to the list of accepted
13241324
values.
13251325

1326-
Starting version 5.6, elements ``hidden`` and ``via`` is added to the list of
1327-
accepted values. ``via`` is only supported on :mconfig:`avail_output`.
1326+
Starting version 5.6, elements ``hidden``, ``provided-alias`` and ``via`` are
1327+
added to the list of accepted values. ``via`` is only supported on
1328+
:mconfig:`avail_output`.
13281329

13291330
:mconfig:`list_output`, :mconfig:`list_terse_output`
13301331

doc/source/design/output-configuration.rst

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,14 @@ Specification
6060

6161
- Accepted elements in value lists are:
6262

63-
- For ``avail`` options: modulepath, alias, dirwsym, indesym, sym, tag, key,
64-
variant, variantifspec, hidden, via (only on regular output)
63+
- For ``avail`` options: modulepath, alias, provided-alias, dirwsym,
64+
indesym, sym, tag, key, variant, variantifspec, hidden, via (only on
65+
regular output)
6566
- For ``list`` options: header, idx, variant, alias, indesym, sym, tag, key,
6667
hidden
67-
- For ``spider`` options: modulepath, alias, dirwsym, indesym, sym, tag,
68-
key, variant, variantifspec, hidden, via (only on regular output)
68+
- For ``spider`` options: modulepath, alias, provided-alias, dirwsym,
69+
indesym, sym, tag, key, variant, variantifspec, hidden, via (only on
70+
regular output)
6971

7072
- If the ``-o``/``--output`` options are wrongly specified
7173

doc/source/module.rst

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -492,9 +492,9 @@ switches are accepted:
492492
of the elements in *LIST* does not matter.
493493

494494
Accepted elements in *LIST* for :subcmd:`avail` and :subcmd:`spider`
495-
sub-command are: *modulepath*, *alias*, *dirwsym*, *indesym*, *sym*, *tag*,
496-
*key*, *hidden*, *variant*, *variantifspec* and *via*. *via* element is not
497-
accepted on terse output mode.
495+
sub-command are: *modulepath*, *alias*, *provided-alias*, *dirwsym*,
496+
*indesym*, *sym*, *tag*, *key*, *hidden*, *variant*, *variantifspec* and
497+
*via*. *via* element is not accepted on terse output mode.
498498

499499
Accepted elements in *LIST* for :subcmd:`list` sub-command are: *header*,
500500
*idx*, *variant*, *alias*, *indesym*, *sym*, *tag*, *hidden* and *key*.
@@ -536,8 +536,8 @@ switches are accepted:
536536
:subcmd:`spider` sub-commands
537537

538538
.. versionchanged:: 5.6
539-
Element *via* added for :subcmd:`avail` and :subcmd:`spider`
540-
sub-commands
539+
Elements *provided-alias* and *via* added for :subcmd:`avail` and
540+
:subcmd:`spider` sub-commands
541541

542542
.. option:: --paginate
543543

@@ -3500,11 +3500,13 @@ Extra match search is triggered when:
35003500
triggered to collect commands used in modulefiles or modulercs then match
35013501
them against extra specifier query
35023502

3503-
If search query does not contain an extra query and if variant information
3504-
should not be reported, no extra match search is performed. If search query
3505-
does not contain any module name and version but contains an extra query or if
3506-
variant information should be reported, extra match search is applied to all
3507-
available modulefiles.
3503+
If search query does not contain an extra query and if variant or provided
3504+
alias information should not be reported, no extra match search is performed.
3505+
If search query does not contain any module name and version but contains an
3506+
extra query or if variant information should be reported, extra match search
3507+
is applied to all available modulefiles. If provided alias information should
3508+
be reported, extra match search is applied to all available modulefiles even
3509+
if search query contains a module specification.
35083510

35093511
During this specific evaluation, modulefiles are interpreted in *scan* mode.
35103512
This mode aims to collect the different Tcl modulefile commands used. Special
@@ -4577,6 +4579,8 @@ ENVIRONMENT
45774579
Accepted elements that can be set in value list are:
45784580

45794581
* ``alias``: module aliases.
4582+
* ``provided-alias``: show module aliases and evaluate all modulefiles to get
4583+
aliases provided by them.
45804584
* ``dirwsym``: directories associated with symbolic versions.
45814585
* ``hidden``: show all hidden modules.
45824586
* ``indesym``: symbolic versions reported independently from the module or
@@ -4619,7 +4623,7 @@ ENVIRONMENT
46194623
Element ``indesym`` added
46204624

46214625
.. versionchanged:: 5.6
4622-
Elements ``hidden`` and ``via`` added
4626+
Elements ``hidden``, ``provided-alias`` and ``via`` added
46234627

46244628
.. envvar:: MODULES_AVAIL_TERSE_OUTPUT
46254629

@@ -4646,7 +4650,7 @@ ENVIRONMENT
46464650
Elements ``variant`` and ``variantifspec`` added
46474651

46484652
.. versionchanged:: 5.6
4649-
Element ``hidden`` added
4653+
Elements ``hidden`` and ``provided-alias`` added
46504654

46514655
.. envvar:: MODULES_CACHE_BUFFER_BYTES
46524656

@@ -5526,6 +5530,8 @@ ENVIRONMENT
55265530
Accepted elements that can be set in value list are:
55275531

55285532
* ``alias``: module aliases.
5533+
* ``provided-alias``: show module aliases and evaluate all modulefiles to get
5534+
aliases provided by them.
55295535
* ``dirwsym``: directories associated with symbolic versions.
55305536
* ``hidden``: show all hidden modules.
55315537
* ``indesym``: symbolic versions reported independently from the module or

0 commit comments

Comments
 (0)