Skip to content

Commit b0130b3

Browse files
committed
tcl: Remove quotes around shell alias name
As shell alias names must be a single word (without space character) there is no need to enclose this name in quotes in Tcl.
1 parent 5521f8a commit b0130b3

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

shpc/main/modules/templates/docker.tcl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,21 @@ set runCmd "{{ command }} \${DOCKER_OPTS} run -i{% if tty %}t{% endif %} \${DOCK
6060
set inspectCmd "{{ command }} \${DOCKER_OPTS} inspect ${containerPath}"
6161

6262
# set_shell_function takes bashStr and cshStr
63-
set-alias "{|module_name|}-shell" "${shellCmd}"
63+
set-alias {|module_name|}-shell "${shellCmd}"
6464

6565
# exec functions to provide "alias" to module commands
6666
{% if aliases %}{% for alias in aliases %}
67-
set-alias "{{ alias.name }}" "${execCmd} {% if alias.options %} {{ alias.options }} {% endif %} --entrypoint {{ alias.entrypoint }} ${containerPath} {{ alias.command }} $*"
67+
set-alias {{ alias.name }} "${execCmd} {% if alias.options %} {{ alias.options }} {% endif %} --entrypoint {{ alias.entrypoint }} ${containerPath} {{ alias.command }} $*"
6868
{% endfor %}{% endif %}
6969

7070
# A customizable exec function
71-
set-alias "{|module_name|}-exec" "${execCmd} --entrypoint \"\" ${containerPath} $*"
71+
set-alias {|module_name|}-exec "${execCmd} --entrypoint \"\" ${containerPath} $*"
7272

7373
# Always provide a container run
74-
set-alias "{|module_name|}-run" "${runCmd} $*"
74+
set-alias {|module_name|}-run "${runCmd} $*"
7575

7676
# Inspect runscript or deffile easily!
77-
set-alias "{|module_name|}-inspect" "${inspectCmd} ${containerPath} $*"
77+
set-alias {|module_name|}-inspect "${inspectCmd} ${containerPath} $*"
7878

7979
#=====
8080
# Module options

shpc/main/modules/templates/singularity.tcl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,23 @@ set runCmd "singularity \${SINGULARITY_OPTS} run \${SINGULARITY_COMMAND_OPTS} {%
7272
set inspectCmd "singularity \${SINGULARITY_OPTS} inspect \${SINGULARITY_COMMAND_OPTS} "
7373

7474
# set_shell_function takes bashStr and cshStr
75-
set-alias "{|module_name|}-shell" "${shellCmd} $*"
75+
set-alias {|module_name|}-shell "${shellCmd} $*"
7676

7777

7878
# exec functions to provide "alias" to module commands
7979
{% if aliases %}{% for alias in aliases %}
80-
set-alias "{{ alias.name }}" "${execCmd} {% if alias.options %} {{ alias.options }} {% endif %} ${containerPath} {{ alias.command }} $*"
80+
set-alias {{ alias.name }} "${execCmd} {% if alias.options %} {{ alias.options }} {% endif %} ${containerPath} {{ alias.command }} $*"
8181
{% endfor %}{% endif %}
8282

8383
# A customizable exec function
84-
set-alias "{|module_name|}-exec" "${execCmd} ${containerPath} \${SINGULARITY_COMMAND_ARGS} $*"
84+
set-alias {|module_name|}-exec "${execCmd} ${containerPath} \${SINGULARITY_COMMAND_ARGS} $*"
8585

8686
# Always provide a container run
87-
set-alias "{|module_name|}-run" "${runCmd} $*"
87+
set-alias {|module_name|}-run "${runCmd} $*"
8888

8989
# Inspect runscript or deffile easily!
90-
set-alias "{|module_name|}-inspect-runscript" "${inspectCmd} -r ${containerPath}"
91-
set-alias "{|module_name|}-inspect-deffile" "${inspectCmd} -d ${containerPath}"
90+
set-alias {|module_name|}-inspect-runscript "${inspectCmd} -r ${containerPath}"
91+
set-alias {|module_name|}-inspect-deffile "${inspectCmd} -d ${containerPath}"
9292

9393
#=====
9494
# Module options

0 commit comments

Comments
 (0)