Merge pull request #4685 from Micket/fix_unset

Use more robust mechanism for unsetting environment variables

Author: boegel

easybuild/tools/run.py

@@ -234,8 +234,19 @@ def create_cmd_scripts(cmd_str, work_dir, env, tmpdir, out_file, err_file):
     with open(env_fp, 'w') as fid:
         # unset all environment variables in current environment first to start from a clean slate;
         # we need to be careful to filter out functions definitions, so first undefine those
-        fid.write("unset -f $(env | grep '%=' | cut -f1 -d'%' | sed 's/BASH_FUNC_//g')\n")
-        fid.write("unset $(env | cut -f1 -d=)\n")
+        fid.write('\n'.join([
+            'for var in $(compgen -e); do',
+            '    unset "$var"',
+            'done',
+        ]) + '\n')
+        # also unset any bash functions
+        fid.write('\n'.join([
+            'for func in $(compgen -A function); do',
+            '    if [[ $func != _* ]]; then',
+            '        unset -f "$func"',
+            '    fi',
+            'done',
+        ]) + '\n')
 
         # excludes bash functions (environment variables ending with %)
         fid.write('\n'.join(f'export {key}={shlex.quote(value)}' for key, value in sorted(env.items())

test/framework/run.py

@@ -294,7 +294,8 @@ def test_run_shell_cmd_env(self):
         env_script = os.path.join(cmd_tmpdir, 'env.sh')
         self.assertExists(env_script)
         env_script_txt = read_file(env_script)
-        self.assertTrue(env_script_txt.startswith('unset -f $('))
+        self.assertIn('unset "$var"', env_script_txt)
+        self.assertIn('unset -f "$func"', env_script_txt)
         self.assertIn('\nexport FOOBAR=foobar\nexport PATH', env_script_txt)
 
         cmd_script = os.path.join(cmd_tmpdir, 'cmd.sh')