Applied suggestions from code review

Co-authored-by: jaimergp <[email protected]>
conda · Sep 25, 2023 · c7a2965 · c7a2965
1 parent b95078f
commit c7a2965
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/constructor/osxpkg.py b/constructor/osxpkg.py
@@ -308,10 +308,10 @@ def move_script(src, dst, info, ensure_shebang=False, user_script_type=None):
         'CONSTRUCTOR_VERSION': info['CONSTRUCTOR_VERSION'],
     }
     data = preprocess(data, ppd)
-    custom_variables = info.get('extra_env_variables', [])
+    custom_variables = info.get('extra_env_variables', {})
     data = fill_template(data, replace)
 
-    data = data.replace("_EXTRA_ENV_VARIABLES_=''", '\n'.join([f'export {var}' for var in custom_variables]))
+    data = data.replace("_EXTRA_ENV_VARIABLES_=''", '\n'.join([f'export {key}={value}' for key, value in custom_variables.items()]))
 
 
     with open(dst, 'w') as fo:

diff --git a/constructor/shar.py b/constructor/shar.py
@@ -92,11 +92,11 @@ def get_header(conda_exec, tarball, info):
 
     data = read_header_template()
     data = preprocess(data, ppd)
-    custom_variables = info.get('extra_env_variables', [])
+    custom_variables = info.get('extra_env_variables', {})
     data = fill_template(data, replace)
 
     data = data.replace("_EXTRA_ENV_VARIABLES_=''", '\n'.join(
-        [f'export {var}' for var in custom_variables]))
+        [f'export {key}={value}' for key, value in custom_variables.items()]))
     return data
 
 

diff --git a/constructor/winexe.py b/constructor/winexe.py
@@ -96,11 +96,8 @@ def setup_extra_env_variables(info) -> List[str]:
         List[str]: Commands to be inserted into nsi template
     """
     lines = []
-    for variable in info.get('extra_env_variables',[]):
-        split = variable.split('=')
-        if len(split)==2:
-            (name, val) = split
-        lines.append(f"""System::Call 'kernel32::SetEnvironmentVariable(t,t)i("{name}", "{val}").r0'""")
+    for name, value in info.get('extra_env_variables', {}).items():
+        lines.append(f"""System::Call 'kernel32::SetEnvironmentVariable(t,t)i("{name}", {str_esc(value)}).r0'""")
 
     return lines
 

diff --git a/examples/scripts/construct.yaml b/examples/scripts/construct.yaml
@@ -7,8 +7,8 @@ specs:
   - python
 
 extra_env_variables:
-  - CUSTOM_VARIABLE_1=CUSTOM1
-  - CUSTOM_VARIABLE_2=CUSTOM2
+  CUSTOM_VARIABLE_1: CUSTOM1
+  CUSTOM_VARIABLE_2: CUSTOM2
 
 pre_install: pre_install.sh   # [unix]
 pre_install: pre_install.bat  # [win]