Merge pull request #463 from singularityhub/quote-labels

labels in tcl files should be quoted

Author: vsoch

CHANGELOG.md

@@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are:
 The versions coincide with releases on pip. Only major versions will be released as tags on Github.
 
 ## [0.0.x](https://github.scom/singularityhub/singularity-hpc/tree/master) (0.0.x)
+ - Adding quotes around tcl descriptions (0.0.37)
  - fixing bug with container install (does not honor module directory) (0.0.36)
  - `.version` file should be written in top level of module folders [#450](https://github.com/singularityhub/singularity-hpc/issues/450) (0.0.35)
   - tcl module functions need `$@` to handle additional arguments

shpc/main/modules/templates/docker.tcl

@@ -47,7 +47,7 @@ set workdir [pwd]
 {% if description %}set notes       "{{ description }}"{% endif %}
 {% if url %}set homepage    "{{ url }}"{% endif %}
 set helpcommand "This module is a {{ docker }} container wrapper for {{ name }} v{{ version }}. {% if description %}{{ description }}{% endif %}"
-{% if labels %}{% for key, value in labels.items() %}set {{ key }} {{ value }}
+{% if labels %}{% for key, value in labels.items() %}set {{ key }} "{{ value }}"
 {% endfor %}{% endif %}
 
 # conflict with modules with the same alias name

shpc/main/modules/templates/singularity.tcl

@@ -53,7 +53,7 @@ set containerPath {{ container_sif }}
 {% if description %}set notes       "{{ description }}"{% endif %}
 {% if url %}set homepage    "{{ url }}"{% endif %}
 set helpcommand "This module is a singularity container wrapper for {{ name }} v{{ version }}. {% if description %}{{ description }}{% endif %}"
-{% if labels %}{% for key, value in labels.items() %}set {{ key }} {{ value }}
+{% if labels %}{% for key, value in labels.items() %}set {{ key }} "{{ value }}"
 {% endfor %}{% endif %}
 
 # conflict with modules with the same alias name

shpc/version.py

@@ -2,7 +2,7 @@
 __copyright__ = "Copyright 2021, Vanessa Sochat"
 __license__ = "MPL 2.0"
 
-__version__ = "0.0.36"
+__version__ = "0.0.37"
 AUTHOR = "Vanessa Sochat"
 NAME = "singularity-hpc"
 PACKAGE_URL = "https://github.com/singularityhub/singularity-hpc"