From c5d2f47afa3f9ae5270127a0bd0073ece656a784 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 12 Jul 2024 14:32:14 +0200 Subject: [PATCH] modulecmd: don't show extension of Lua modulefiles --- Pmodules/modulecmd.bash.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in index a8d5310..a40ba82 100644 --- a/Pmodules/modulecmd.bash.in +++ b/Pmodules/modulecmd.bash.in @@ -1288,7 +1288,7 @@ subcommand_avail() { output_header "$1" local -i i=0 for (( i=0; i<${#mods[@]}; i+=4 )); do - local mod=${mods[i]} + local mod=${mods[i]%.lua} local relstage=${mods[i+1]} case ${relstage} in stable ) @@ -1315,7 +1315,7 @@ subcommand_avail() { long_output() { output_header "$1" for (( i=0; i<${#mods[@]}; i+=4 )); do - local mod=${mods[i]} + local mod=${mods[i]%.lua} local relstage=${mods[i+1]} case ${relstage} in stable ) @@ -1342,10 +1342,10 @@ subcommand_avail() { local relstage=${mods[i+1]} case ${relstage} in stable ) - mod="${mods[i]}" + mod="${mods[i]%.lua}" ;; * ) - mod="${mods[i]}(${relstage:0:1})" + mod="${mods[i]%.lua}(${relstage:0:1})" ;; esac else @@ -2109,7 +2109,7 @@ subcommand_list() { local strs=() local -i n=1 local -i colsize=0 - for module in "${modules[@]}"; do + for module in "${modules[@]%.lua}"; do local s=$(printf "%2d) %-s" $n "${module}") strs+=( "$s" ) local -i sizeof_s=${#s} @@ -2160,7 +2160,7 @@ subcommand_list() { IFS=':' read -r -a modules \ < <( ${sed} "s;${MODULEPATH//:/\/\\\|}/;;g" <<< "${_LMFILES_}" ) printf "Currently Loaded Modules:\n" 1>&2 - for module in "${modules[@]}"; do + for module in "${modules[@]%.lua}"; do printf "${module}\n" 1>&2 done printf -- "\n\n" 1>&2