diff options
author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-05-29 14:01:02 +0200 |
---|---|---|
committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-05-29 14:01:02 +0200 |
commit | 0fb84530dee9af40a9abb1601edc92df93f90c9d (patch) | |
tree | d7de9e5ad9769ae4cd0d7b143c836a66c97aa2e8 | |
parent | 32a62c205007354371986d419be5da738efb32f9 (diff) | |
parent | 08863d06b412c121247ee13fd545a59be21ad15f (diff) | |
download | rules-cc-0fb84530dee9af40a9abb1601edc92df93f90c9d.tar.gz |
Merge subtree 'rules' into rules-cc
-rw-r--r-- | rules/shell/RULES | 6 | ||||
-rw-r--r-- | rules/shell/test/EXPRESSIONS | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/rules/shell/RULES b/rules/shell/RULES index 3175c34..41530a2 100644 --- a/rules/shell/RULES +++ b/rules/shell/RULES @@ -255,7 +255,11 @@ , "then": { "type": "singleton_map" , "key": "PATH" - , "value": {"type": "var", "name": "PATH"} + , "value": + { "type": "join" + , "separator": ":" + , "$1": {"type": "var", "name": "PATH"} + } } , "else": {"type": "empty_map"} } diff --git a/rules/shell/test/EXPRESSIONS b/rules/shell/test/EXPRESSIONS index 2526973..19c48db 100644 --- a/rules/shell/test/EXPRESSIONS +++ b/rules/shell/test/EXPRESSIONS @@ -236,10 +236,7 @@ , "value": {"type": "var", "name": "ATTEMPT"} } } - , { "type": "var" - , "name": "TEST_ENV" - , "default": {"type": "empty_map"} - } + , {"type": "var", "name": "test_env"} ] } ] |