#47: Revert - not a bug. Cover with proper tests and use cases

docs/examples/recursive-env-in-yaml/.rkd/makefile.yml

@@ -0,0 +1,11 @@
+version: org.riotkit.rkd/yaml/v1
+
+tasks:
+    :hello:
+        environment:
+            FIRST: "First"
+            SECOND: "Second"
+            THIRD: "Escaped one"
+            ALL: ${FIRST} ${SECOND} \${THIRD}
+        steps: |
+            echo "${ALL}"

src/rkd/taskutil.py

@@ -78,7 +78,7 @@ def sh(self, cmd: str, capture: bool = False, verbose: bool = False, strict: boo
             env_str = ""
 
             for name, value in env.items():
-                value = '' if value is None else str(value).replace('"', '\\"').replace('$', '\$')
+                value = '' if value is None else str(value).replace('"', '\\"')
                 env_str = env_str + (" export %s=\"%s\";\n" % (name, value))
 
             cmd = env_str + cmd

test/test_functional.py

@@ -278,3 +278,20 @@ def test_aliases_are_resolved_recursively(self):
             full_output, exit_code = self._run_and_capture_output([':alias-in-alias-test'])
 
             self.assertIn('Hello world', full_output)
+
+    def test_env_variables_are_recursively_resolved(self):
+        """
+        :hello:
+            environment:
+                FIRST: "First"
+                SECOND: "Second"
+                THIRD: "Escaped one"
+                ALL: ${FIRST} ${SECOND} \${THIRD}
+            steps: |
+                echo "${ALL}"
+        """
+
+        with self.environment({'RKD_PATH': SCRIPT_DIR_PATH + '/../docs/examples/recursive-env-in-yaml/.rkd'}):
+            full_output, exit_code = self._run_and_capture_output([':hello'])
+
+            self.assertIn('First Second ${THIRD}', full_output)

test/test_taskutil.py

@@ -159,10 +159,12 @@ def test_dollar_symbols_are_escaped_in_shell_commands(self):
 
         with io.capture_descriptors(stream=out, enable_standard_out=False):
             task.sh('env | grep TEST_ENV', env={
-                'TEST_ENV': 'Mikhail$1Bakunin$PATHtest'
+                'TEST_ENV': 'Mikhail\$1Bakunin\$PATHtest',
+                'TEST_ENV_NOT_ESCAPED': 'Hello $TEST_ENV'
             })
 
         self.assertIn('TEST_ENV=Mikhail$1Bakunin$PATHtest', out.getvalue())
+        self.assertIn('TEST_ENV_NOT_ESCAPED=Hello Mikhail$1Bakunin$PATHtest', out.getvalue())
 
     def test_quotes_are_escaped_in_shell_commands(self):
         task = InitTask()