Skip to content

Commit

Permalink
fix tcl wrapperDir to have {} and be in quotes
Browse files Browse the repository at this point in the history
Signed-off-by: vsoch <[email protected]>
  • Loading branch information
vsoch committed Sep 18, 2023
1 parent e0fbcd2 commit 3206ddd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion shpc/main/modules/templates/docker.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ set helpcommand "This module is a {{ docker }} container wrapper for {{ module.n
set moduleDir [file dirname [expr { [string equal [file type ${ModulesCurrentModulefile}] "link"] ? [file readlink ${ModulesCurrentModulefile}] : ${ModulesCurrentModulefile} }]]

# If we have wrapper base set, honor it, otherwise we use the moduleDir
{% if settings.wrapper_base %}set wrapperDir "{{ module.wrapper_dir }}"{% else %}set wrapperDir $moduleDir{% endif %}
{% if settings.wrapper_base %}set wrapperDir "{{ module.wrapper_dir }}"{% else %}set wrapperDir "${moduleDir}"{% endif %}

# conflict with modules with the same alias name
conflict {{ parsed_name.tool }}
Expand Down
2 changes: 1 addition & 1 deletion shpc/main/modules/templates/singularity.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ set helpcommand "This module is a singularity container wrapper for {{ module.na
set moduleDir [file dirname [expr { [string equal [file type ${ModulesCurrentModulefile}] "link"] ? [file readlink ${ModulesCurrentModulefile}] : ${ModulesCurrentModulefile} }]]

# If we have wrapper base set, honor it, otherwise we use the moduleDir
{% if settings.wrapper_base %}set wrapperDir "{{ module.wrapper_dir }}"{% else %}set wrapperDir $moduleDir{% endif %}
{% if settings.wrapper_base %}set wrapperDir "{{ module.wrapper_dir }}"{% else %}set wrapperDir "${moduleDir}"{% endif %}

# conflict with modules with the same alias name
conflict {{ parsed_name.tool }}
Expand Down

0 comments on commit 3206ddd

Please sign in to comment.