Merge pull request #16 from xylar/fix_shell_env_vars

Replace `$SHELL{}` with `$()` in environment variables

conda/meta.yaml

@@ -1,5 +1,5 @@
 {% set name = "mache" %}
-{% set version = "1.1.3" %}
+{% set version = "1.1.4" %}
 
 package:
   name: {{ name|lower }}

mache/__init__.py

@@ -1,5 +1,5 @@
 from mache.machine_info import MachineInfo
 from mache.discover import discover_machine
 
-__version_info__ = (1, 1, 3)
+__version_info__ = (1, 1, 4)
 __version__ = '.'.join(str(vi) for vi in __version_info__)

mache/machine_info.py

@@ -280,6 +280,10 @@ def get_modules_and_mpi_compilers(self, compiler, mpilib, debug=False,
                     value = var.text
                     # go from the XML syntax to bash variable syntax
                     value = value.replace('$ENV{', '${')
+                    if '$SHELL' in value:
+                        value = value.replace('$SHELL{', '$(')
+                        # replace the last curly bracket with a parenthesis
+                        value = ')'.join(value.rsplit('}', 1))
 
                     env_vars[var_name] = value
 

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mache
-version = 1.1.3
+version = 1.1.4
 author = Xylar Asay-Davis
 author_email = [email protected]
 description = A package for providing configuration data relate to E3SM supported machines