Merge "Don't use bash eval for Linux.runCommand" into stable/liberty

meta/io.murano/Resources/RunCommand.template

@@ -2,18 +2,19 @@ FormatVersion: 2.0.0
 Version: 1.0.0
 Name: $planName
 
-Parameters:
-  command: $command
+Body: return runCommand()
 
-Body: |
-  return runCommand("{0}".format(args.command))
+Files:
+  scriptFile:
+    BodyType: Text
+    Name: scriptFile.sh
+    Body: $command
 
 Scripts:
   runCommand:
     Type: Application
     Version: 1.0.0
-    EntryPoint: runCommand.sh
-    Files: []
+    EntryPoint: scriptFile.sh
     Options:
       captureStdout: $captureStdout
       captureStderr: $captureStderr

meta/io.murano/Resources/scripts/runCommand.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-eval ${*}

murano/engine/system/agent.py

@@ -243,11 +243,13 @@ class Agent(object):
             if 'EntryPoint' not in script:
                 raise ValueError('No entry point in script ' + name)
 
-            if 'Application' in script['Type']:
-                script['EntryPoint'] = self._place_file(scripts_folder,
-                                                        script['EntryPoint'],
-                                                        template, resources,
-                                                        files)
+            if 'Application' == script['Type']:
+                if script['EntryPoint'] not in files:
+                    script['EntryPoint'] = self._place_file(
+                        scripts_folder, script['EntryPoint'],
+                        template, resources, files)
+                else:
+                    script['EntryPoint'] = files[script['EntryPoint']]
             if 'Files' in script:
                 for i, file in enumerate(script['Files']):
                     if self._get_name(file) not in files: