From 3fa66733056a2d7c1b2afcf2eca978a7c29bedc3 Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Tue, 28 May 2024 18:45:19 +0200
Subject: ["shell", "cmds"]: correctly join PATH

... as shell environment variable has to be a string, not a list.
---
 shell/RULES | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/shell/RULES b/shell/RULES
index 3175c34..41530a2 100644
--- a/shell/RULES
+++ b/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"}
           }
-- 
cgit v1.2.3


From 08863d06b412c121247ee13fd545a59be21ad15f Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Wed, 29 May 2024 12:58:12 +0200
Subject: ["shell/test", "script"] Keep computed path

... instead of throwing it away after correctly computing it. Fixes the environment
if the shell defaults bring a custom path.
---
 shell/test/EXPRESSIONS | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/shell/test/EXPRESSIONS b/shell/test/EXPRESSIONS
index 2526973..19c48db 100644
--- a/shell/test/EXPRESSIONS
+++ b/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"}
             ]
           }
         ]
-- 
cgit v1.2.3